From 2521dafdbf490b080730da4c8a4aca45ace27b0b Mon Sep 17 00:00:00 2001 From: wuliushuan Date: Fri, 18 Oct 2024 10:13:21 +0000 Subject: [PATCH] =?UTF-8?q?access=5Ftoken=20SASDK=20=E6=95=B4=E6=94=B92024?= =?UTF-8?q?1018?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wuliushuan Change-Id: Iec9ca8a1822fadb6371b674fb72e4ddd8b6f075f --- BUILD.gn | 8 +-- bundle.json | 58 ++++++++++++++----- frameworks/accesstoken/BUILD.gn | 4 +- frameworks/common/BUILD.gn | 2 +- .../inner_api}/accesstoken/BUILD.gn | 5 +- .../accesstoken/libaccesstoken_sdk.map | 0 .../src/accesstoken_callback_stubs.cpp | 0 .../accesstoken/src/accesstoken_callbacks.cpp | 0 .../src/accesstoken_death_recipient.cpp | 0 .../src/accesstoken_death_recipient.h | 0 .../accesstoken/src/accesstoken_kit.cpp | 0 .../src/accesstoken_manager_client.cpp | 0 .../src/accesstoken_manager_client.h | 0 .../src/accesstoken_manager_proxy.cpp | 0 .../src/accesstoken_manager_proxy.h | 0 .../perm_state_change_callback_customize.cpp | 0 .../accesstoken/src/tokenid_kit.cpp | 0 .../inner_api}/accesstoken/test/BUILD.gn | 16 ++--- .../test/mock/src/iservice_registry.cpp | 0 .../inner_api}/accesstoken/test/tool/BUILD.gn | 22 +++---- .../grant_short_term_write_imagevideo.cpp | 0 .../test/tool/set_pern_dialog_cap.cpp | 0 .../test/tool/verify_acesstoken.cpp | 0 .../accesstoken_kit_test.cpp | 0 .../accesstoken_kit_test.h | 0 .../unittest/src/accesstoken_deny_test.cpp | 0 .../test/unittest/src/accesstoken_deny_test.h | 0 .../src/accesstoken_kit_extension_test.cpp | 0 .../src/accesstoken_kit_extension_test.h | 0 .../unittest/src/accesstoken_kit_test.cpp | 0 .../test/unittest/src/accesstoken_kit_test.h | 0 .../src/accesstoken_location_request_test.cpp | 0 .../src/accesstoken_location_request_test.h | 0 .../src/accesstoken_location_update_test.cpp | 0 .../src/accesstoken_location_update_test.h | 0 ...accesstoken_short_time_permission_test.cpp | 0 .../accesstoken_short_time_permission_test.h | 0 .../src/app_installation_optimized_test.cpp | 0 .../src/app_installation_optimized_test.h | 0 .../src/clone_app_permission_test.cpp | 0 .../unittest/src/clone_app_permission_test.h | 0 .../test/unittest/src/edm_policy_set_test.cpp | 0 .../test/unittest/src/edm_policy_set_test.h | 0 .../unittest/src/remote_token_kit_test.cpp | 0 .../test/unittest/src/remote_token_kit_test.h | 0 .../src/security_component_grant_test.cpp | 0 .../src/security_component_grant_test.h | 0 .../share_permission_with_sandbox_test.cpp | 0 .../src/share_permission_with_sandbox_test.h | 0 .../inner_api}/nativetoken/BUILD.gn | 4 +- .../inner_api}/nativetoken/src/nativetoken.c | 0 .../nativetoken/src/nativetoken_json_oper.c | 0 .../nativetoken/src/nativetoken_klog.c | 0 .../inner_api}/nativetoken/test/BUILD.gn | 5 +- .../nativetoken/test/mock/include/cJSON.h | 0 .../nativetoken/test/mock/src/cJSON.c | 0 .../unittest/mock/nativetoken_oper_test.cpp | 0 .../unittest/mock/nativetoken_oper_test.h | 0 .../unittest/src/nativetoken_kit_test.cpp | 0 .../test/unittest/src/nativetoken_kit_test.h | 0 .../unittest/src/nativetoken_oper_test.cpp | 0 .../test/unittest/src/nativetoken_oper_test.h | 0 frameworks/inner_api/privacy/BUILD.gn | 2 +- frameworks/inner_api/privacy/test/BUILD.gn | 24 ++++---- .../inner_api/privacy/test/tool/BUILD.gn | 10 ++-- .../inner_api}/token_callback/BUILD.gn | 5 +- .../token_callback/libtoken_callback_sdk.map | 0 .../src/token_callback_stub.cpp | 0 .../inner_api}/token_callback/test/BUILD.gn | 2 +- .../test/unittest/src/token_callback_test.cpp | 0 .../test/unittest/src/token_callback_test.h | 0 .../inner_api}/token_setproc/BUILD.gn | 3 +- .../token_setproc/src/perm_setproc.cpp | 0 .../token_setproc/src/token_setproc.c | 0 .../inner_api}/token_setproc/test/BUILD.gn | 0 .../unittest/src/tokensetproc_kit_test.cpp | 0 .../test/unittest/src/tokensetproc_kit_test.h | 0 frameworks/inner_api/tokensync/BUILD.gn | 3 +- frameworks/inner_api/tokensync/test/BUILD.gn | 3 +- frameworks/js/napi/accesstoken/BUILD.gn | 13 +++-- frameworks/js/napi/common/BUILD.gn | 2 +- frameworks/js/napi/privacy/BUILD.gn | 2 +- frameworks/privacy/BUILD.gn | 2 +- frameworks/test/unittest/BUILD.gn | 2 +- .../accesstoken/include/access_token.h | 0 .../accesstoken/include/access_token_error.h | 0 .../include/accesstoken_callback_stubs.h | 0 .../include/accesstoken_callbacks.h | 0 .../accesstoken/include/accesstoken_kit.h | 0 ...esstoken_state_change_ipc_interface_code.h | 0 .../include/atm_tools_param_info.h | 0 .../accesstoken/include/hap_token_info.h | 0 .../include/hap_token_info_for_sync_parcel.h | 0 .../include/i_permission_state_callback.h | 0 .../include/i_token_sync_callback.h | 0 .../accesstoken/include/native_token_info.h | 0 .../perm_state_change_callback_customize.h | 0 .../accesstoken/include/permission_def.h | 0 .../accesstoken/include/permission_dlp_mode.h | 0 .../include/permission_grant_info.h | 0 .../include/permission_list_state.h | 0 .../include/permission_state_change_info.h | 0 .../include/permission_state_full.h | 0 .../include/sec_comp_enhance_data.h | 0 .../include/token_sync_kit_interface.h | 0 .../accesstoken/include/tokenid_kit.h | 0 .../tokensync_callback_ipc_interface_code.h | 0 .../nativetoken/include/nativetoken.h | 0 .../include/nativetoken_json_oper.h | 0 .../nativetoken/include/nativetoken_kit.h | 0 .../nativetoken/include/nativetoken_klog.h | 0 ...esstoken_grant_result_ipc_interface_code.h | 0 .../token_callback/include/i_token_callback.h | 0 .../include/token_callback_stub.h | 0 .../token_setproc/include/perm_setproc.h | 0 .../token_setproc/include/setproc_common.h | 0 .../token_setproc/include/token_setproc.h | 0 .../innerkits/el5filekeymanager/test/BUILD.gn | 4 +- interfaces/kits/capi/accesstoken/BUILD.gn | 6 +- interfaces/kits/cj/accesstoken/BUILD.gn | 12 ++-- services/accesstokenmanager/BUILD.gn | 8 +-- .../accesstokenmanager/test/coverage/BUILD.gn | 20 +++---- .../accesstokenmanager/test/unittest/BUILD.gn | 20 +++---- services/common/BUILD.gn | 2 +- services/common/app_manager/BUILD.gn | 2 +- services/common/database/test/BUILD.gn | 2 +- services/common/test/BUILD.gn | 6 +- services/common/window_manager/BUILD.gn | 2 +- services/common/window_manager/test/BUILD.gn | 2 +- services/el5filekeymanager/BUILD.gn | 4 +- services/el5filekeymanager/test/BUILD.gn | 18 +++--- services/privacymanager/BUILD.gn | 6 +- .../privacymanager/test/coverage/BUILD.gn | 8 +-- services/privacymanager/test/tool/BUILD.gn | 2 +- .../privacymanager/test/unittest/BUILD.gn | 8 +-- services/tokensyncmanager/BUILD.gn | 6 +- .../tokensyncmanager/test/coverage/BUILD.gn | 10 ++-- .../tokensyncmanager/test/unittest/BUILD.gn | 10 ++-- .../accesstoken/allochaptoken_fuzzer/BUILD.gn | 4 +- .../alloclocaltokenid_fuzzer/BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../deleteremotedevicetokens_fuzzer/BUILD.gn | 4 +- .../deleteremotetoken_fuzzer/BUILD.gn | 4 +- .../accesstoken/deletetoken_fuzzer/BUILD.gn | 4 +- .../accesstoken/dumptokeninfo_fuzzer/BUILD.gn | 4 +- .../getdefpermission_fuzzer/BUILD.gn | 2 +- .../getdefpermissions_fuzzer/BUILD.gn | 4 +- .../accesstoken/gethapdlpflag_fuzzer/BUILD.gn | 4 +- .../accesstoken/gethaptokenid_fuzzer/BUILD.gn | 4 +- .../gethaptokeninfo_fuzzer/BUILD.gn | 4 +- .../gethaptokeninfofromremote_fuzzer/BUILD.gn | 4 +- .../getnativetokenid_fuzzer/BUILD.gn | 4 +- .../getnativetokeninfo_fuzzer/BUILD.gn | 4 +- .../getpermissionflags_fuzzer/BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../getpermissionsstatus_fuzzer/BUILD.gn | 10 ++-- .../getpermissionusedtype_fuzzer/BUILD.gn | 4 +- .../getremotenativetokenid_fuzzer/BUILD.gn | 4 +- .../getrendertokenid_fuzzer/BUILD.gn | 4 +- .../getreqpermissions_fuzzer/BUILD.gn | 4 +- .../getselfpermissionsstate_fuzzer/BUILD.gn | 4 +- .../accesstoken/gettokentype_fuzzer/BUILD.gn | 4 +- .../gettokentypeflag_fuzzer/BUILD.gn | 4 +- .../grantpermission_fuzzer/BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../accesstoken/inithaptoken_fuzzer/BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../registertokensynccallback_fuzzer/BUILD.gn | 6 +- .../BUILD.gn | 4 +- .../setpermdialogcap_fuzzer/BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../setremotehaptokeninfo_fuzzer/BUILD.gn | 4 +- .../BUILD.gn | 4 +- .../BUILD.gn | 6 +- .../updatehaptoken_fuzzer/BUILD.gn | 4 +- .../verifyaccesstoken001_fuzzer/BUILD.gn | 4 +- .../verifyaccesstoken_fuzzer/BUILD.gn | 4 +- .../addpermissionusedrecord_fuzzer/BUILD.gn | 2 +- .../getpermissionusedrecords_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../privacy/getseccompenhance_fuzzer/BUILD.gn | 2 +- .../getspecialseccompenhance_fuzzer/BUILD.gn | 2 +- .../isallowedusingpermission_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../registerseccompenhance_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../privacy/setmutepolicy_fuzzer/BUILD.gn | 2 +- .../startusingpermission001_fuzzer/BUILD.gn | 2 +- .../startusingpermission_fuzzer/BUILD.gn | 2 +- .../stopusingpermission_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../updateseccompenhance_fuzzer/BUILD.gn | 2 +- .../accesstoken/access_token_service_fuzz.gni | 12 ++-- .../getaccesstokenid_fuzzer/BUILD.gn | 4 +- .../getpermissionsstatusstub_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 6 +- .../setfirstcallertokenid_fuzzer/BUILD.gn | 4 +- .../setpermdialogcap_fuzzer/BUILD.gn | 2 +- .../BUILD.gn | 2 +- .../services/privacy/privacy_service_fuzz.gni | 8 +-- .../sethapwithfgreminderstub_fuzzer/BUILD.gn | 2 +- .../privacy/setmutepolicystub_fuzzer/BUILD.gn | 2 +- tools/accesstoken/BUILD.gn | 2 +- 203 files changed, 319 insertions(+), 276 deletions(-) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/BUILD.gn (95%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/libaccesstoken_sdk.map (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_callback_stubs.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_callbacks.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_death_recipient.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_death_recipient.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_kit.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_manager_client.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_manager_client.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_manager_proxy.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/accesstoken_manager_proxy.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/perm_state_change_callback_customize.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/src/tokenid_kit.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/BUILD.gn (89%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/mock/src/iservice_registry.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/tool/BUILD.gn (72%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/tool/set_pern_dialog_cap.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/tool/verify_acesstoken.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_deny_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_deny_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_kit_extension_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_kit_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_kit_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_location_request_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_location_update_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_location_update_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/app_installation_optimized_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/app_installation_optimized_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/clone_app_permission_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/clone_app_permission_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/edm_policy_set_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/edm_policy_set_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/remote_token_kit_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/remote_token_kit_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/security_component_grant_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/security_component_grant_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/accesstoken/test/unittest/src/share_permission_with_sandbox_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/BUILD.gn (94%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/src/nativetoken.c (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/src/nativetoken_json_oper.c (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/src/nativetoken_klog.c (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/BUILD.gn (92%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/mock/include/cJSON.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/mock/src/cJSON.c (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/unittest/mock/nativetoken_oper_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/unittest/mock/nativetoken_oper_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/unittest/src/nativetoken_kit_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/unittest/src/nativetoken_kit_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/unittest/src/nativetoken_oper_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/nativetoken/test/unittest/src/nativetoken_oper_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_callback/BUILD.gn (91%) rename {interfaces/innerkits => frameworks/inner_api}/token_callback/libtoken_callback_sdk.map (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_callback/src/token_callback_stub.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_callback/test/BUILD.gn (95%) rename {interfaces/innerkits => frameworks/inner_api}/token_callback/test/unittest/src/token_callback_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_callback/test/unittest/src/token_callback_test.h (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_setproc/BUILD.gn (95%) rename {interfaces/innerkits => frameworks/inner_api}/token_setproc/src/perm_setproc.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_setproc/src/token_setproc.c (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_setproc/test/BUILD.gn (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp (100%) rename {interfaces/innerkits => frameworks/inner_api}/token_setproc/test/unittest/src/tokensetproc_kit_test.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/access_token.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/access_token_error.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/accesstoken_callback_stubs.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/accesstoken_callbacks.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/accesstoken_kit.h (100%) rename {frameworks => interfaces/inner_api}/accesstoken/include/accesstoken_state_change_ipc_interface_code.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/atm_tools_param_info.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/hap_token_info.h (100%) rename {frameworks => interfaces/inner_api}/accesstoken/include/hap_token_info_for_sync_parcel.h (100%) rename {frameworks => interfaces/inner_api}/accesstoken/include/i_permission_state_callback.h (100%) rename {frameworks => interfaces/inner_api}/accesstoken/include/i_token_sync_callback.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/native_token_info.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/perm_state_change_callback_customize.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/permission_def.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/permission_dlp_mode.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/permission_grant_info.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/permission_list_state.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/permission_state_change_info.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/permission_state_full.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/sec_comp_enhance_data.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/token_sync_kit_interface.h (100%) rename interfaces/{innerkits => inner_api}/accesstoken/include/tokenid_kit.h (100%) rename {frameworks => interfaces/inner_api}/accesstoken/include/tokensync_callback_ipc_interface_code.h (100%) rename interfaces/{innerkits => inner_api}/nativetoken/include/nativetoken.h (100%) rename interfaces/{innerkits => inner_api}/nativetoken/include/nativetoken_json_oper.h (100%) rename interfaces/{innerkits => inner_api}/nativetoken/include/nativetoken_kit.h (100%) rename interfaces/{innerkits => inner_api}/nativetoken/include/nativetoken_klog.h (100%) rename interfaces/{innerkits => inner_api}/token_callback/include/accesstoken_grant_result_ipc_interface_code.h (100%) rename interfaces/{innerkits => inner_api}/token_callback/include/i_token_callback.h (100%) rename interfaces/{innerkits => inner_api}/token_callback/include/token_callback_stub.h (100%) rename interfaces/{innerkits => inner_api}/token_setproc/include/perm_setproc.h (100%) rename interfaces/{innerkits => inner_api}/token_setproc/include/setproc_common.h (100%) rename interfaces/{innerkits => inner_api}/token_setproc/include/token_setproc.h (100%) diff --git a/BUILD.gn b/BUILD.gn index 38dfcc5c4..8cd8895b0 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -19,14 +19,14 @@ group("accesstoken_build_module_test") { deps = [] if (is_standard_system) { deps += [ + "frameworks/inner_api/accesstoken/test:unittest", + "frameworks/inner_api/nativetoken/test:unittest", "frameworks/inner_api/privacy/test:unittest", + "frameworks/inner_api/token_callback/test:unittest", + "frameworks/inner_api/token_setproc/test:unittest", "frameworks/test/unittest:unittest", - "interfaces/innerkits/accesstoken/test:unittest", "interfaces/innerkits/analysis_model/test:unittest", "interfaces/innerkits/el5filekeymanager/test:unittest", - "interfaces/innerkits/nativetoken/test:unittest", - "interfaces/innerkits/token_callback/test:unittest", - "interfaces/innerkits/token_setproc/test:unittest", "services/accesstokenmanager/test:unittest", "services/common/database/test:unittest", ] diff --git a/bundle.json b/bundle.json index bba30dc85..39f7f53d2 100644 --- a/bundle.json +++ b/bundle.json @@ -85,39 +85,61 @@ }, "inner_kits": [ { - "name": "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "name": "//base/security/access_token/frameworks/inner_api/accesstoken:libaccesstoken_sdk", "header": { "header_files": [ - "accesstoken_kit.h" + "access_token_error.h", + "access_token.h", + "accesstoken_callback_stubs.h", + "accesstoken_callbacks.h", + "accesstoken_kit.h", + "accesstoken_state_change_ipc_interface_code.h", + "atm_tools_param_info.h", + "hap_token_info_for_sync_parcel.h", + "hap_token_info.h", + "i_permission_state_callback.h", + "i_token_sync_callback.h", + "native_token_info.h", + "perm_state_change_callback_customize.h", + "permission_def.h", + "permission_dlp_mode.h", + "permission_grant_info.h", + "permission_list_state.h", + "permission_state_change_info.h", + "permission_state_full.h", + "sec_comp_enhance_data.h", + "token_sync_kit_interface.h", + "tokenid_kit.h", + "tokensync_callback_ipc_interface_code.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/include" + "header_base": "//base/security/access_token/interfaces/inner_api/accesstoken/include" } }, { - "name": "//base/security/access_token/interfaces/innerkits/accesstoken:libtokenid_sdk", + "name": "//base/security/access_token/frameworks/inner_api/accesstoken:libtokenid_sdk", "header": { "header_files": [ "tokenid_kit.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/accesstoken/include" + "header_base": "//base/security/access_token/interfaces/inner_api/accesstoken/include" } }, { - "name": "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", + "name": "//base/security/access_token/frameworks/inner_api/nativetoken:libnativetoken", "header": { "header_files": [ "nativetoken_kit.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/nativetoken/include" + "header_base": "//base/security/access_token/interfaces/inner_api/nativetoken/include" } }, { - "name": "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken_shared", + "name": "//base/security/access_token/frameworks/inner_api/nativetoken:libnativetoken_shared", "header": { "header_files": [ "nativetoken_kit.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/nativetoken/include" + "header_base": "//base/security/access_token/interfaces/inner_api/nativetoken/include" } }, { @@ -142,30 +164,36 @@ } }, { - "name": "//base/security/access_token/interfaces/innerkits/token_callback:libtoken_callback_sdk", + "name": "//base/security/access_token/frameworks/inner_api/token_callback:libtoken_callback_sdk", "header": { "header_files": [ + "accesstoken_grant_result_ipc_interface_code.h", + "i_token_callback.h", "token_callback_stub.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/token_callback/include" + "header_base": "//base/security/access_token/interfaces/inner_api/token_callback/include" } }, { - "name": "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", + "name": "//base/security/access_token/frameworks/inner_api/token_setproc:libtoken_setproc", "header": { "header_files": [ + "perm_setproc.h", + "setproc_common.h", "token_setproc.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/token_setproc/include" + "header_base": "//base/security/access_token/interfaces/inner_api/token_setproc/include" } }, { - "name": "//base/security/access_token/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "name": "//base/security/access_token/frameworks/inner_api/token_setproc:libtokensetproc_shared", "header": { "header_files": [ + "perm_setproc.h", + "setproc_common.h", "token_setproc.h" ], - "header_base": "//base/security/access_token/interfaces/innerkits/token_setproc/include" + "header_base": "//base/security/access_token/interfaces/inner_api/token_setproc/include" } }, { diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn index bface813f..7293287a0 100644 --- a/frameworks/accesstoken/BUILD.gn +++ b/frameworks/accesstoken/BUILD.gn @@ -19,7 +19,7 @@ config("accesstoken_communication_adapter_cxx_public_config") { include_dirs = [ "include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", ] } @@ -43,7 +43,7 @@ ohos_shared_library("accesstoken_communication_adapter_cxx") { "${access_token_path}/config:coverage_flags", ] include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "include", ] diff --git a/frameworks/common/BUILD.gn b/frameworks/common/BUILD.gn index f5d71a222..eca68c49f 100644 --- a/frameworks/common/BUILD.gn +++ b/frameworks/common/BUILD.gn @@ -36,7 +36,7 @@ ohos_shared_library("accesstoken_common_cxx") { public_configs = [ ":accesstoken_common_cxx_public_config" ] include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "include", ] diff --git a/interfaces/innerkits/accesstoken/BUILD.gn b/frameworks/inner_api/accesstoken/BUILD.gn similarity index 95% rename from interfaces/innerkits/accesstoken/BUILD.gn rename to frameworks/inner_api/accesstoken/BUILD.gn index 92a07dcac..cef964073 100644 --- a/interfaces/innerkits/accesstoken/BUILD.gn +++ b/frameworks/inner_api/accesstoken/BUILD.gn @@ -16,7 +16,8 @@ import("../../../access_token.gni") config("accesstoken") { visibility = [ ":*" ] - include_dirs = [ "include" ] + include_dirs = + [ "${access_token_path}/interfaces/inner_api/accesstoken/include" ] } if (is_standard_system) { @@ -63,7 +64,7 @@ if (is_standard_system) { ":libtokenid_sdk", "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", ] external_deps = [ diff --git a/interfaces/innerkits/accesstoken/libaccesstoken_sdk.map b/frameworks/inner_api/accesstoken/libaccesstoken_sdk.map similarity index 100% rename from interfaces/innerkits/accesstoken/libaccesstoken_sdk.map rename to frameworks/inner_api/accesstoken/libaccesstoken_sdk.map diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp b/frameworks/inner_api/accesstoken/src/accesstoken_callback_stubs.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_callback_stubs.cpp rename to frameworks/inner_api/accesstoken/src/accesstoken_callback_stubs.cpp diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_callbacks.cpp b/frameworks/inner_api/accesstoken/src/accesstoken_callbacks.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_callbacks.cpp rename to frameworks/inner_api/accesstoken/src/accesstoken_callbacks.cpp diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.cpp b/frameworks/inner_api/accesstoken/src/accesstoken_death_recipient.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.cpp rename to frameworks/inner_api/accesstoken/src/accesstoken_death_recipient.cpp diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.h b/frameworks/inner_api/accesstoken/src/accesstoken_death_recipient.h similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_death_recipient.h rename to frameworks/inner_api/accesstoken/src/accesstoken_death_recipient.h diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp b/frameworks/inner_api/accesstoken/src/accesstoken_kit.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_kit.cpp rename to frameworks/inner_api/accesstoken/src/accesstoken_kit.cpp diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp b/frameworks/inner_api/accesstoken/src/accesstoken_manager_client.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_manager_client.cpp rename to frameworks/inner_api/accesstoken/src/accesstoken_manager_client.cpp diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h b/frameworks/inner_api/accesstoken/src/accesstoken_manager_client.h similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_manager_client.h rename to frameworks/inner_api/accesstoken/src/accesstoken_manager_client.h diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp b/frameworks/inner_api/accesstoken/src/accesstoken_manager_proxy.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.cpp rename to frameworks/inner_api/accesstoken/src/accesstoken_manager_proxy.cpp diff --git a/interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h b/frameworks/inner_api/accesstoken/src/accesstoken_manager_proxy.h similarity index 100% rename from interfaces/innerkits/accesstoken/src/accesstoken_manager_proxy.h rename to frameworks/inner_api/accesstoken/src/accesstoken_manager_proxy.h diff --git a/interfaces/innerkits/accesstoken/src/perm_state_change_callback_customize.cpp b/frameworks/inner_api/accesstoken/src/perm_state_change_callback_customize.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/perm_state_change_callback_customize.cpp rename to frameworks/inner_api/accesstoken/src/perm_state_change_callback_customize.cpp diff --git a/interfaces/innerkits/accesstoken/src/tokenid_kit.cpp b/frameworks/inner_api/accesstoken/src/tokenid_kit.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/src/tokenid_kit.cpp rename to frameworks/inner_api/accesstoken/src/tokenid_kit.cpp diff --git a/interfaces/innerkits/accesstoken/test/BUILD.gn b/frameworks/inner_api/accesstoken/test/BUILD.gn similarity index 89% rename from interfaces/innerkits/accesstoken/test/BUILD.gn rename to frameworks/inner_api/accesstoken/test/BUILD.gn index 58f62e5f1..dd4110c3c 100644 --- a/interfaces/innerkits/accesstoken/test/BUILD.gn +++ b/frameworks/inner_api/accesstoken/test/BUILD.gn @@ -31,8 +31,8 @@ ohos_unittest("libaccesstoken_sdk_test") { "${access_token_path}/frameworks/tokensync/include", "../include", "../src", - "${access_token_path}/interfaces/innerkits/nativetoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", ] sources = [ @@ -56,9 +56,9 @@ ohos_unittest("libaccesstoken_sdk_test") { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "../:libaccesstoken_sdk", "../:libtokenid_sdk", ] @@ -94,7 +94,7 @@ ohos_unittest("accesstoken_mock_test") { "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/nativetoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", "../../token_setproc/include", "../include", "../src", @@ -118,8 +118,8 @@ ohos_unittest("accesstoken_mock_test") { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "../:libtokenid_sdk", ] diff --git a/interfaces/innerkits/accesstoken/test/mock/src/iservice_registry.cpp b/frameworks/inner_api/accesstoken/test/mock/src/iservice_registry.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/mock/src/iservice_registry.cpp rename to frameworks/inner_api/accesstoken/test/mock/src/iservice_registry.cpp diff --git a/interfaces/innerkits/accesstoken/test/tool/BUILD.gn b/frameworks/inner_api/accesstoken/test/tool/BUILD.gn similarity index 72% rename from interfaces/innerkits/accesstoken/test/tool/BUILD.gn rename to frameworks/inner_api/accesstoken/test/tool/BUILD.gn index 5e05c5810..6876682ac 100644 --- a/interfaces/innerkits/accesstoken/test/tool/BUILD.gn +++ b/frameworks/inner_api/accesstoken/test/tool/BUILD.gn @@ -26,14 +26,14 @@ ohos_executable("SetPermDialogCapTest") { sources = [ "set_pern_dialog_cap.cpp" ] include_dirs = [ - "${access_token_path}/interfaces/innerkits/nativetoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", ] subsystem_name = "security" @@ -52,14 +52,14 @@ ohos_executable("GrantShortTermWriteImageVideo") { sources = [ "grant_short_term_write_imagevideo.cpp" ] include_dirs = [ - "${access_token_path}/interfaces/innerkits/nativetoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", ] subsystem_name = "security" @@ -78,7 +78,7 @@ ohos_executable("VerifyAccessToken") { sources = [ "verify_acesstoken.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] subsystem_name = "security" diff --git a/interfaces/innerkits/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp b/frameworks/inner_api/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp rename to frameworks/inner_api/accesstoken/test/tool/grant_short_term_write_imagevideo.cpp diff --git a/interfaces/innerkits/accesstoken/test/tool/set_pern_dialog_cap.cpp b/frameworks/inner_api/accesstoken/test/tool/set_pern_dialog_cap.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/tool/set_pern_dialog_cap.cpp rename to frameworks/inner_api/accesstoken/test/tool/set_pern_dialog_cap.cpp diff --git a/interfaces/innerkits/accesstoken/test/tool/verify_acesstoken.cpp b/frameworks/inner_api/accesstoken/test/tool/verify_acesstoken.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/tool/verify_acesstoken.cpp rename to frameworks/inner_api/accesstoken/test/tool/verify_acesstoken.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.h b/frameworks/inner_api/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.h rename to frameworks/inner_api/accesstoken/test/unittest/accesstoken_mock_test/accesstoken_kit_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_deny_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_deny_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_deny_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_deny_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_deny_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_extension_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_extension_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_extension_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_extension_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_kit_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_kit_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_request_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_request_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_request_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_request_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_update_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_update_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_update_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_update_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_update_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_update_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_location_update_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_location_update_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/accesstoken_short_time_permission_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/app_installation_optimized_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/app_installation_optimized_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/app_installation_optimized_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/app_installation_optimized_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/app_installation_optimized_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/clone_app_permission_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/clone_app_permission_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/clone_app_permission_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/clone_app_permission_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/clone_app_permission_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/edm_policy_set_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/edm_policy_set_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/edm_policy_set_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/edm_policy_set_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/edm_policy_set_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/remote_token_kit_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/remote_token_kit_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/remote_token_kit_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/remote_token_kit_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/remote_token_kit_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/security_component_grant_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/security_component_grant_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/security_component_grant_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/security_component_grant_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/security_component_grant_test.h diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp b/frameworks/inner_api/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp rename to frameworks/inner_api/accesstoken/test/unittest/src/share_permission_with_sandbox_test.cpp diff --git a/interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.h b/frameworks/inner_api/accesstoken/test/unittest/src/share_permission_with_sandbox_test.h similarity index 100% rename from interfaces/innerkits/accesstoken/test/unittest/src/share_permission_with_sandbox_test.h rename to frameworks/inner_api/accesstoken/test/unittest/src/share_permission_with_sandbox_test.h diff --git a/interfaces/innerkits/nativetoken/BUILD.gn b/frameworks/inner_api/nativetoken/BUILD.gn similarity index 94% rename from interfaces/innerkits/nativetoken/BUILD.gn rename to frameworks/inner_api/nativetoken/BUILD.gn index 1caeae894..879f86393 100644 --- a/interfaces/innerkits/nativetoken/BUILD.gn +++ b/frameworks/inner_api/nativetoken/BUILD.gn @@ -12,10 +12,12 @@ # limitations under the License. import("//build/ohos.gni") +import("../../../access_token.gni") config("accesstokenlib") { visibility = [ ":*" ] - include_dirs = [ "include" ] + include_dirs = + [ "${access_token_path}/interfaces/inner_api/nativetoken/include" ] } if (is_standard_system) { diff --git a/interfaces/innerkits/nativetoken/src/nativetoken.c b/frameworks/inner_api/nativetoken/src/nativetoken.c similarity index 100% rename from interfaces/innerkits/nativetoken/src/nativetoken.c rename to frameworks/inner_api/nativetoken/src/nativetoken.c diff --git a/interfaces/innerkits/nativetoken/src/nativetoken_json_oper.c b/frameworks/inner_api/nativetoken/src/nativetoken_json_oper.c similarity index 100% rename from interfaces/innerkits/nativetoken/src/nativetoken_json_oper.c rename to frameworks/inner_api/nativetoken/src/nativetoken_json_oper.c diff --git a/interfaces/innerkits/nativetoken/src/nativetoken_klog.c b/frameworks/inner_api/nativetoken/src/nativetoken_klog.c similarity index 100% rename from interfaces/innerkits/nativetoken/src/nativetoken_klog.c rename to frameworks/inner_api/nativetoken/src/nativetoken_klog.c diff --git a/interfaces/innerkits/nativetoken/test/BUILD.gn b/frameworks/inner_api/nativetoken/test/BUILD.gn similarity index 92% rename from interfaces/innerkits/nativetoken/test/BUILD.gn rename to frameworks/inner_api/nativetoken/test/BUILD.gn index 27b4f72aa..6bfcbf37b 100644 --- a/interfaces/innerkits/nativetoken/test/BUILD.gn +++ b/frameworks/inner_api/nativetoken/test/BUILD.gn @@ -25,7 +25,8 @@ ohos_unittest("libnativetoken_test") { } branch_protector_ret = "pac_ret" - include_dirs = [ "../include" ] + include_dirs = + [ "${access_token_path}/interfaces/inner_api/nativetoken/include" ] sources = [ "unittest/src/nativetoken_kit_test.cpp", @@ -55,7 +56,7 @@ ohos_unittest("libnativetoken_mock_test") { branch_protector_ret = "pac_ret" include_dirs = [ - "../include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", "mock/include/", ] diff --git a/interfaces/innerkits/nativetoken/test/mock/include/cJSON.h b/frameworks/inner_api/nativetoken/test/mock/include/cJSON.h similarity index 100% rename from interfaces/innerkits/nativetoken/test/mock/include/cJSON.h rename to frameworks/inner_api/nativetoken/test/mock/include/cJSON.h diff --git a/interfaces/innerkits/nativetoken/test/mock/src/cJSON.c b/frameworks/inner_api/nativetoken/test/mock/src/cJSON.c similarity index 100% rename from interfaces/innerkits/nativetoken/test/mock/src/cJSON.c rename to frameworks/inner_api/nativetoken/test/mock/src/cJSON.c diff --git a/interfaces/innerkits/nativetoken/test/unittest/mock/nativetoken_oper_test.cpp b/frameworks/inner_api/nativetoken/test/unittest/mock/nativetoken_oper_test.cpp similarity index 100% rename from interfaces/innerkits/nativetoken/test/unittest/mock/nativetoken_oper_test.cpp rename to frameworks/inner_api/nativetoken/test/unittest/mock/nativetoken_oper_test.cpp diff --git a/interfaces/innerkits/nativetoken/test/unittest/mock/nativetoken_oper_test.h b/frameworks/inner_api/nativetoken/test/unittest/mock/nativetoken_oper_test.h similarity index 100% rename from interfaces/innerkits/nativetoken/test/unittest/mock/nativetoken_oper_test.h rename to frameworks/inner_api/nativetoken/test/unittest/mock/nativetoken_oper_test.h diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp b/frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_kit_test.cpp similarity index 100% rename from interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.cpp rename to frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_kit_test.cpp diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h b/frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_kit_test.h similarity index 100% rename from interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_kit_test.h rename to frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_kit_test.h diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.cpp b/frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_oper_test.cpp similarity index 100% rename from interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.cpp rename to frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_oper_test.cpp diff --git a/interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.h b/frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_oper_test.h similarity index 100% rename from interfaces/innerkits/nativetoken/test/unittest/src/nativetoken_oper_test.h rename to frameworks/inner_api/nativetoken/test/unittest/src/nativetoken_oper_test.h diff --git a/frameworks/inner_api/privacy/BUILD.gn b/frameworks/inner_api/privacy/BUILD.gn index 30c7a5615..9baa3a458 100644 --- a/frameworks/inner_api/privacy/BUILD.gn +++ b/frameworks/inner_api/privacy/BUILD.gn @@ -41,7 +41,7 @@ if (is_standard_system) { include_dirs = [ "${access_token_path}/frameworks/privacy/include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "src", ] diff --git a/frameworks/inner_api/privacy/test/BUILD.gn b/frameworks/inner_api/privacy/test/BUILD.gn index 620d969ba..3853d5cd5 100644 --- a/frameworks/inner_api/privacy/test/BUILD.gn +++ b/frameworks/inner_api/privacy/test/BUILD.gn @@ -32,9 +32,10 @@ ohos_unittest("libprivacy_sdk_test") { "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/nativetoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", ] sources = [ @@ -53,12 +54,13 @@ ohos_unittest("libprivacy_sdk_test") { deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", ] external_deps = [ "c_utils:utils", @@ -93,9 +95,9 @@ ohos_unittest("libprivacy_mock_test") { "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/nativetoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", ] sources = [ @@ -118,10 +120,10 @@ ohos_unittest("libprivacy_mock_test") { deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", ] external_deps = [ diff --git a/frameworks/inner_api/privacy/test/tool/BUILD.gn b/frameworks/inner_api/privacy/test/tool/BUILD.gn index ce03ef3bf..20b295231 100644 --- a/frameworks/inner_api/privacy/test/tool/BUILD.gn +++ b/frameworks/inner_api/privacy/test/tool/BUILD.gn @@ -26,16 +26,16 @@ ohos_executable("AddPermissionUsedRecord") { sources = [ "add_permission_used_record.cpp" ] include_dirs = [ - "${access_token_path}/interfaces/innerkits/nativetoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", "${access_token_path}/interfaces/inner_api/privacy/include", ] deps = [ + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", ] external_deps = [ diff --git a/interfaces/innerkits/token_callback/BUILD.gn b/frameworks/inner_api/token_callback/BUILD.gn similarity index 91% rename from interfaces/innerkits/token_callback/BUILD.gn rename to frameworks/inner_api/token_callback/BUILD.gn index 89111ca16..fa23d3684 100644 --- a/interfaces/innerkits/token_callback/BUILD.gn +++ b/frameworks/inner_api/token_callback/BUILD.gn @@ -16,7 +16,8 @@ import("../../../access_token.gni") config("token_callback") { visibility = [ ":*" ] - include_dirs = [ "include" ] + include_dirs = + [ "${access_token_path}/interfaces/inner_api/token_callback/include" ] } if (is_standard_system) { @@ -47,7 +48,7 @@ if (is_standard_system) { "src", "${access_token_path}/frameworks/privacy/include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", ] sources = [ "src/token_callback_stub.cpp" ] diff --git a/interfaces/innerkits/token_callback/libtoken_callback_sdk.map b/frameworks/inner_api/token_callback/libtoken_callback_sdk.map similarity index 100% rename from interfaces/innerkits/token_callback/libtoken_callback_sdk.map rename to frameworks/inner_api/token_callback/libtoken_callback_sdk.map diff --git a/interfaces/innerkits/token_callback/src/token_callback_stub.cpp b/frameworks/inner_api/token_callback/src/token_callback_stub.cpp similarity index 100% rename from interfaces/innerkits/token_callback/src/token_callback_stub.cpp rename to frameworks/inner_api/token_callback/src/token_callback_stub.cpp diff --git a/interfaces/innerkits/token_callback/test/BUILD.gn b/frameworks/inner_api/token_callback/test/BUILD.gn similarity index 95% rename from interfaces/innerkits/token_callback/test/BUILD.gn rename to frameworks/inner_api/token_callback/test/BUILD.gn index d2df573b8..7b515a24e 100644 --- a/interfaces/innerkits/token_callback/test/BUILD.gn +++ b/frameworks/inner_api/token_callback/test/BUILD.gn @@ -26,7 +26,7 @@ ohos_unittest("libtoken_callback_test") { branch_protector_ret = "pac_ret" include_dirs = - [ "${access_token_path}/interfaces/innerkits/token_callback/include" ] + [ "${access_token_path}/interfaces/inner_api/token_callback/include" ] sources = [ "unittest/src/token_callback_test.cpp" ] diff --git a/interfaces/innerkits/token_callback/test/unittest/src/token_callback_test.cpp b/frameworks/inner_api/token_callback/test/unittest/src/token_callback_test.cpp similarity index 100% rename from interfaces/innerkits/token_callback/test/unittest/src/token_callback_test.cpp rename to frameworks/inner_api/token_callback/test/unittest/src/token_callback_test.cpp diff --git a/interfaces/innerkits/token_callback/test/unittest/src/token_callback_test.h b/frameworks/inner_api/token_callback/test/unittest/src/token_callback_test.h similarity index 100% rename from interfaces/innerkits/token_callback/test/unittest/src/token_callback_test.h rename to frameworks/inner_api/token_callback/test/unittest/src/token_callback_test.h diff --git a/interfaces/innerkits/token_setproc/BUILD.gn b/frameworks/inner_api/token_setproc/BUILD.gn similarity index 95% rename from interfaces/innerkits/token_setproc/BUILD.gn rename to frameworks/inner_api/token_setproc/BUILD.gn index 0b0d7d83a..fd7ada6fc 100644 --- a/interfaces/innerkits/token_setproc/BUILD.gn +++ b/frameworks/inner_api/token_setproc/BUILD.gn @@ -16,7 +16,8 @@ import("../../../access_token.gni") config("setproc_config") { visibility = [ ":*" ] - include_dirs = [ "include" ] + include_dirs = + [ "${access_token_path}/interfaces/inner_api/token_setproc/include" ] } if (is_standard_system) { diff --git a/interfaces/innerkits/token_setproc/src/perm_setproc.cpp b/frameworks/inner_api/token_setproc/src/perm_setproc.cpp similarity index 100% rename from interfaces/innerkits/token_setproc/src/perm_setproc.cpp rename to frameworks/inner_api/token_setproc/src/perm_setproc.cpp diff --git a/interfaces/innerkits/token_setproc/src/token_setproc.c b/frameworks/inner_api/token_setproc/src/token_setproc.c similarity index 100% rename from interfaces/innerkits/token_setproc/src/token_setproc.c rename to frameworks/inner_api/token_setproc/src/token_setproc.c diff --git a/interfaces/innerkits/token_setproc/test/BUILD.gn b/frameworks/inner_api/token_setproc/test/BUILD.gn similarity index 100% rename from interfaces/innerkits/token_setproc/test/BUILD.gn rename to frameworks/inner_api/token_setproc/test/BUILD.gn diff --git a/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp b/frameworks/inner_api/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp similarity index 100% rename from interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp rename to frameworks/inner_api/token_setproc/test/unittest/src/tokensetproc_kit_test.cpp diff --git a/interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h b/frameworks/inner_api/token_setproc/test/unittest/src/tokensetproc_kit_test.h similarity index 100% rename from interfaces/innerkits/token_setproc/test/unittest/src/tokensetproc_kit_test.h rename to frameworks/inner_api/token_setproc/test/unittest/src/tokensetproc_kit_test.h diff --git a/frameworks/inner_api/tokensync/BUILD.gn b/frameworks/inner_api/tokensync/BUILD.gn index 3f131b206..13f4d9046 100644 --- a/frameworks/inner_api/tokensync/BUILD.gn +++ b/frameworks/inner_api/tokensync/BUILD.gn @@ -37,8 +37,9 @@ if (is_standard_system) { "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", "${access_token_path}/interfaces/inner_api/tokensync/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "include", "src", ] diff --git a/frameworks/inner_api/tokensync/test/BUILD.gn b/frameworks/inner_api/tokensync/test/BUILD.gn index 8c2bebd25..5bf8c67e5 100644 --- a/frameworks/inner_api/tokensync/test/BUILD.gn +++ b/frameworks/inner_api/tokensync/test/BUILD.gn @@ -28,8 +28,9 @@ ohos_unittest("libtokensync_sdk_test") { include_dirs = [ "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/tokensync/include", + "../include", "../src", ] diff --git a/frameworks/js/napi/accesstoken/BUILD.gn b/frameworks/js/napi/accesstoken/BUILD.gn index 6cebe5c4c..74017185f 100644 --- a/frameworks/js/napi/accesstoken/BUILD.gn +++ b/frameworks/js/napi/accesstoken/BUILD.gn @@ -23,11 +23,12 @@ ohos_shared_library("libabilityaccessctrl") { branch_protector_ret = "pac_ret" include_dirs = [ "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/token_callback/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", "${access_token_path}/interfaces/kits/js/napi/common/include", "${access_token_path}/interfaces/kits/js/napi/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/token_callback/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", + "../common/include", ] sources = [ @@ -39,9 +40,9 @@ ohos_shared_library("libabilityaccessctrl") { ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_callback:libtoken_callback_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_callback:libtoken_callback_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "../common:libnapi_common", ] diff --git a/frameworks/js/napi/common/BUILD.gn b/frameworks/js/napi/common/BUILD.gn index 10b5fbf05..8d7253f42 100644 --- a/frameworks/js/napi/common/BUILD.gn +++ b/frameworks/js/napi/common/BUILD.gn @@ -24,8 +24,8 @@ ohos_static_library("libnapi_common") { include_dirs = [ "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", "${access_token_path}/interfaces/kits/js/napi/common/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", ] sources = [ diff --git a/frameworks/js/napi/privacy/BUILD.gn b/frameworks/js/napi/privacy/BUILD.gn index 5ec4101dc..dc068a199 100644 --- a/frameworks/js/napi/privacy/BUILD.gn +++ b/frameworks/js/napi/privacy/BUILD.gn @@ -24,7 +24,7 @@ ohos_shared_library("libprivacymanager") { include_dirs = [ "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "${access_token_path}/interfaces/kits/js/napi/common/include", "${access_token_path}/interfaces/kits/js/napi/privacy/include", diff --git a/frameworks/privacy/BUILD.gn b/frameworks/privacy/BUILD.gn index 7820f02bf..a2b4d4007 100644 --- a/frameworks/privacy/BUILD.gn +++ b/frameworks/privacy/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("privacy_communication_adapter_cxx") { include_dirs = [ "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/inner_api/privacy/src", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "include", ] diff --git a/frameworks/test/unittest/BUILD.gn b/frameworks/test/unittest/BUILD.gn index f4cf72a72..fe14c8f4e 100644 --- a/frameworks/test/unittest/BUILD.gn +++ b/frameworks/test/unittest/BUILD.gn @@ -16,7 +16,7 @@ import("../../../access_token.gni") config("accesstoken_test_config") { include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "../../accesstoken/include", "../../common/include", diff --git a/interfaces/innerkits/accesstoken/include/access_token.h b/interfaces/inner_api/accesstoken/include/access_token.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/access_token.h rename to interfaces/inner_api/accesstoken/include/access_token.h diff --git a/interfaces/innerkits/accesstoken/include/access_token_error.h b/interfaces/inner_api/accesstoken/include/access_token_error.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/access_token_error.h rename to interfaces/inner_api/accesstoken/include/access_token_error.h diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_callback_stubs.h b/interfaces/inner_api/accesstoken/include/accesstoken_callback_stubs.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/accesstoken_callback_stubs.h rename to interfaces/inner_api/accesstoken/include/accesstoken_callback_stubs.h diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_callbacks.h b/interfaces/inner_api/accesstoken/include/accesstoken_callbacks.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/accesstoken_callbacks.h rename to interfaces/inner_api/accesstoken/include/accesstoken_callbacks.h diff --git a/interfaces/innerkits/accesstoken/include/accesstoken_kit.h b/interfaces/inner_api/accesstoken/include/accesstoken_kit.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/accesstoken_kit.h rename to interfaces/inner_api/accesstoken/include/accesstoken_kit.h diff --git a/frameworks/accesstoken/include/accesstoken_state_change_ipc_interface_code.h b/interfaces/inner_api/accesstoken/include/accesstoken_state_change_ipc_interface_code.h similarity index 100% rename from frameworks/accesstoken/include/accesstoken_state_change_ipc_interface_code.h rename to interfaces/inner_api/accesstoken/include/accesstoken_state_change_ipc_interface_code.h diff --git a/interfaces/innerkits/accesstoken/include/atm_tools_param_info.h b/interfaces/inner_api/accesstoken/include/atm_tools_param_info.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/atm_tools_param_info.h rename to interfaces/inner_api/accesstoken/include/atm_tools_param_info.h diff --git a/interfaces/innerkits/accesstoken/include/hap_token_info.h b/interfaces/inner_api/accesstoken/include/hap_token_info.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/hap_token_info.h rename to interfaces/inner_api/accesstoken/include/hap_token_info.h diff --git a/frameworks/accesstoken/include/hap_token_info_for_sync_parcel.h b/interfaces/inner_api/accesstoken/include/hap_token_info_for_sync_parcel.h similarity index 100% rename from frameworks/accesstoken/include/hap_token_info_for_sync_parcel.h rename to interfaces/inner_api/accesstoken/include/hap_token_info_for_sync_parcel.h diff --git a/frameworks/accesstoken/include/i_permission_state_callback.h b/interfaces/inner_api/accesstoken/include/i_permission_state_callback.h similarity index 100% rename from frameworks/accesstoken/include/i_permission_state_callback.h rename to interfaces/inner_api/accesstoken/include/i_permission_state_callback.h diff --git a/frameworks/accesstoken/include/i_token_sync_callback.h b/interfaces/inner_api/accesstoken/include/i_token_sync_callback.h similarity index 100% rename from frameworks/accesstoken/include/i_token_sync_callback.h rename to interfaces/inner_api/accesstoken/include/i_token_sync_callback.h diff --git a/interfaces/innerkits/accesstoken/include/native_token_info.h b/interfaces/inner_api/accesstoken/include/native_token_info.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/native_token_info.h rename to interfaces/inner_api/accesstoken/include/native_token_info.h diff --git a/interfaces/innerkits/accesstoken/include/perm_state_change_callback_customize.h b/interfaces/inner_api/accesstoken/include/perm_state_change_callback_customize.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/perm_state_change_callback_customize.h rename to interfaces/inner_api/accesstoken/include/perm_state_change_callback_customize.h diff --git a/interfaces/innerkits/accesstoken/include/permission_def.h b/interfaces/inner_api/accesstoken/include/permission_def.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/permission_def.h rename to interfaces/inner_api/accesstoken/include/permission_def.h diff --git a/interfaces/innerkits/accesstoken/include/permission_dlp_mode.h b/interfaces/inner_api/accesstoken/include/permission_dlp_mode.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/permission_dlp_mode.h rename to interfaces/inner_api/accesstoken/include/permission_dlp_mode.h diff --git a/interfaces/innerkits/accesstoken/include/permission_grant_info.h b/interfaces/inner_api/accesstoken/include/permission_grant_info.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/permission_grant_info.h rename to interfaces/inner_api/accesstoken/include/permission_grant_info.h diff --git a/interfaces/innerkits/accesstoken/include/permission_list_state.h b/interfaces/inner_api/accesstoken/include/permission_list_state.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/permission_list_state.h rename to interfaces/inner_api/accesstoken/include/permission_list_state.h diff --git a/interfaces/innerkits/accesstoken/include/permission_state_change_info.h b/interfaces/inner_api/accesstoken/include/permission_state_change_info.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/permission_state_change_info.h rename to interfaces/inner_api/accesstoken/include/permission_state_change_info.h diff --git a/interfaces/innerkits/accesstoken/include/permission_state_full.h b/interfaces/inner_api/accesstoken/include/permission_state_full.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/permission_state_full.h rename to interfaces/inner_api/accesstoken/include/permission_state_full.h diff --git a/interfaces/innerkits/accesstoken/include/sec_comp_enhance_data.h b/interfaces/inner_api/accesstoken/include/sec_comp_enhance_data.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/sec_comp_enhance_data.h rename to interfaces/inner_api/accesstoken/include/sec_comp_enhance_data.h diff --git a/interfaces/innerkits/accesstoken/include/token_sync_kit_interface.h b/interfaces/inner_api/accesstoken/include/token_sync_kit_interface.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/token_sync_kit_interface.h rename to interfaces/inner_api/accesstoken/include/token_sync_kit_interface.h diff --git a/interfaces/innerkits/accesstoken/include/tokenid_kit.h b/interfaces/inner_api/accesstoken/include/tokenid_kit.h similarity index 100% rename from interfaces/innerkits/accesstoken/include/tokenid_kit.h rename to interfaces/inner_api/accesstoken/include/tokenid_kit.h diff --git a/frameworks/accesstoken/include/tokensync_callback_ipc_interface_code.h b/interfaces/inner_api/accesstoken/include/tokensync_callback_ipc_interface_code.h similarity index 100% rename from frameworks/accesstoken/include/tokensync_callback_ipc_interface_code.h rename to interfaces/inner_api/accesstoken/include/tokensync_callback_ipc_interface_code.h diff --git a/interfaces/innerkits/nativetoken/include/nativetoken.h b/interfaces/inner_api/nativetoken/include/nativetoken.h similarity index 100% rename from interfaces/innerkits/nativetoken/include/nativetoken.h rename to interfaces/inner_api/nativetoken/include/nativetoken.h diff --git a/interfaces/innerkits/nativetoken/include/nativetoken_json_oper.h b/interfaces/inner_api/nativetoken/include/nativetoken_json_oper.h similarity index 100% rename from interfaces/innerkits/nativetoken/include/nativetoken_json_oper.h rename to interfaces/inner_api/nativetoken/include/nativetoken_json_oper.h diff --git a/interfaces/innerkits/nativetoken/include/nativetoken_kit.h b/interfaces/inner_api/nativetoken/include/nativetoken_kit.h similarity index 100% rename from interfaces/innerkits/nativetoken/include/nativetoken_kit.h rename to interfaces/inner_api/nativetoken/include/nativetoken_kit.h diff --git a/interfaces/innerkits/nativetoken/include/nativetoken_klog.h b/interfaces/inner_api/nativetoken/include/nativetoken_klog.h similarity index 100% rename from interfaces/innerkits/nativetoken/include/nativetoken_klog.h rename to interfaces/inner_api/nativetoken/include/nativetoken_klog.h diff --git a/interfaces/innerkits/token_callback/include/accesstoken_grant_result_ipc_interface_code.h b/interfaces/inner_api/token_callback/include/accesstoken_grant_result_ipc_interface_code.h similarity index 100% rename from interfaces/innerkits/token_callback/include/accesstoken_grant_result_ipc_interface_code.h rename to interfaces/inner_api/token_callback/include/accesstoken_grant_result_ipc_interface_code.h diff --git a/interfaces/innerkits/token_callback/include/i_token_callback.h b/interfaces/inner_api/token_callback/include/i_token_callback.h similarity index 100% rename from interfaces/innerkits/token_callback/include/i_token_callback.h rename to interfaces/inner_api/token_callback/include/i_token_callback.h diff --git a/interfaces/innerkits/token_callback/include/token_callback_stub.h b/interfaces/inner_api/token_callback/include/token_callback_stub.h similarity index 100% rename from interfaces/innerkits/token_callback/include/token_callback_stub.h rename to interfaces/inner_api/token_callback/include/token_callback_stub.h diff --git a/interfaces/innerkits/token_setproc/include/perm_setproc.h b/interfaces/inner_api/token_setproc/include/perm_setproc.h similarity index 100% rename from interfaces/innerkits/token_setproc/include/perm_setproc.h rename to interfaces/inner_api/token_setproc/include/perm_setproc.h diff --git a/interfaces/innerkits/token_setproc/include/setproc_common.h b/interfaces/inner_api/token_setproc/include/setproc_common.h similarity index 100% rename from interfaces/innerkits/token_setproc/include/setproc_common.h rename to interfaces/inner_api/token_setproc/include/setproc_common.h diff --git a/interfaces/innerkits/token_setproc/include/token_setproc.h b/interfaces/inner_api/token_setproc/include/token_setproc.h similarity index 100% rename from interfaces/innerkits/token_setproc/include/token_setproc.h rename to interfaces/inner_api/token_setproc/include/token_setproc.h diff --git a/interfaces/innerkits/el5filekeymanager/test/BUILD.gn b/interfaces/innerkits/el5filekeymanager/test/BUILD.gn index dc5d30b89..742b6cfc9 100644 --- a/interfaces/innerkits/el5filekeymanager/test/BUILD.gn +++ b/interfaces/innerkits/el5filekeymanager/test/BUILD.gn @@ -37,9 +37,9 @@ ohos_unittest("el5_filekey_manager_kit_unittest") { configs = [ "${access_token_path}/config:coverage_flags" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/interfaces/innerkits/el5filekeymanager:el5_filekey_manager_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", ] external_deps = [ diff --git a/interfaces/kits/capi/accesstoken/BUILD.gn b/interfaces/kits/capi/accesstoken/BUILD.gn index 11093e09e..736e3d388 100644 --- a/interfaces/kits/capi/accesstoken/BUILD.gn +++ b/interfaces/kits/capi/accesstoken/BUILD.gn @@ -34,9 +34,11 @@ ohos_shared_library("libability_access_control") { sources = [ "src/ability_access_control.cpp" ] + include_dirs = + [ "${access_token_path}/interfaces/inner_api/accesstoken/include" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", ] cflags_cc = [ diff --git a/interfaces/kits/cj/accesstoken/BUILD.gn b/interfaces/kits/cj/accesstoken/BUILD.gn index 35c814931..6ecdd0e08 100644 --- a/interfaces/kits/cj/accesstoken/BUILD.gn +++ b/interfaces/kits/cj/accesstoken/BUILD.gn @@ -27,9 +27,9 @@ ohos_shared_library("cj_ability_access_ctrl_ffi") { branch_protector_ret = "pac_ret" include_dirs = [ "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/token_callback/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/token_callback/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", "../../napi/common/include", ] @@ -44,10 +44,10 @@ ohos_shared_library("cj_ability_access_ctrl_ffi") { ] deps = [ + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_callback:libtoken_callback_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/frameworks/js/napi/common:libnapi_common", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_callback:libtoken_callback_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", ] external_deps = [ diff --git a/services/accesstokenmanager/BUILD.gn b/services/accesstokenmanager/BUILD.gn index 18fa5c8ed..9ba81aac9 100644 --- a/services/accesstokenmanager/BUILD.gn +++ b/services/accesstokenmanager/BUILD.gn @@ -48,7 +48,7 @@ if (is_standard_system) { "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", "${access_token_path}/interfaces/inner_api/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "${access_token_path}/frameworks/inner_api/tokensync/src", "${access_token_path}/services/common/app_manager/include", @@ -123,10 +123,10 @@ if (is_standard_system) { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/services/accesstokenmanager:access_token.rc", "${access_token_path}/services/accesstokenmanager:permission_definition_config", "${access_token_path}/services/common:accesstoken_service_common", diff --git a/services/accesstokenmanager/test/coverage/BUILD.gn b/services/accesstokenmanager/test/coverage/BUILD.gn index 4cf88821d..2186c5c9e 100644 --- a/services/accesstokenmanager/test/coverage/BUILD.gn +++ b/services/accesstokenmanager/test/coverage/BUILD.gn @@ -61,11 +61,11 @@ ohos_unittest("libaccesstoken_manager_service_coverage_test") { "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", - "${access_token_path}/interfaces/innerkits/accesstoken/main/cpp/include", - "${access_token_path}/interfaces/innerkits/accesstoken/src", - "${access_token_path}/interfaces/innerkits/nativetoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", + "${access_token_path}/interfaces/inner_api/accesstoken/main/cpp/include", + "${access_token_path}/interfaces/inner_api/accesstoken/src", + "${access_token_path}/interfaces/inner_api/nativetoken/include", "${access_token_path}/services/common/app_manager/include", "${access_token_path}/services/common/config_policy/include", "${access_token_path}/services/common/database/include", @@ -91,12 +91,12 @@ ohos_unittest("libaccesstoken_manager_service_coverage_test") { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/services/common:accesstoken_service_common", ] diff --git a/services/accesstokenmanager/test/unittest/BUILD.gn b/services/accesstokenmanager/test/unittest/BUILD.gn index 16ece348b..a5e6962aa 100644 --- a/services/accesstokenmanager/test/unittest/BUILD.gn +++ b/services/accesstokenmanager/test/unittest/BUILD.gn @@ -61,11 +61,11 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", - "${access_token_path}/interfaces/innerkits/accesstoken/main/cpp/include", - "${access_token_path}/interfaces/innerkits/accesstoken/src", - "${access_token_path}/interfaces/innerkits/nativetoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", + "${access_token_path}/interfaces/inner_api/accesstoken/main/cpp/include", + "${access_token_path}/interfaces/inner_api/accesstoken/src", + "${access_token_path}/interfaces/inner_api/nativetoken/include", "${access_token_path}/services/common/app_manager/include", "${access_token_path}/services/common/config_policy/include", "${access_token_path}/services/common/database/include", @@ -109,12 +109,12 @@ ohos_unittest("libaccesstoken_manager_service_standard_test") { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/services/common:accesstoken_service_common", ] diff --git a/services/common/BUILD.gn b/services/common/BUILD.gn index 0f9cb5a02..3adff9d82 100644 --- a/services/common/BUILD.gn +++ b/services/common/BUILD.gn @@ -38,7 +38,7 @@ ohos_static_library("accesstoken_service_common") { branch_protector_ret = "pac_ret" include_dirs = [ "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", ] public_configs = [ ":accesstoken_service_common_public_config" ] diff --git a/services/common/app_manager/BUILD.gn b/services/common/app_manager/BUILD.gn index 477fc0d22..73a5889ab 100644 --- a/services/common/app_manager/BUILD.gn +++ b/services/common/app_manager/BUILD.gn @@ -27,7 +27,7 @@ ohos_shared_library("accesstoken_app_manager") { include_dirs = [ "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "include", ] diff --git a/services/common/database/test/BUILD.gn b/services/common/database/test/BUILD.gn index 0984317f1..54a9ff8c1 100644 --- a/services/common/database/test/BUILD.gn +++ b/services/common/database/test/BUILD.gn @@ -28,7 +28,7 @@ ohos_unittest("libdatabase_test") { include_dirs = [ "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/services/common/database/include", "${access_token_path}/services/common/utils/include", "${access_token_path}/services/accesstokenmanager/main/cpp/include/callback", diff --git a/services/common/test/BUILD.gn b/services/common/test/BUILD.gn index f79f990d8..4a6b7d148 100644 --- a/services/common/test/BUILD.gn +++ b/services/common/test/BUILD.gn @@ -42,11 +42,11 @@ if (is_standard_system && ability_base_enable) { deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", "${access_token_path}/services/common:accesstoken_service_common", "${access_token_path}/services/privacymanager:privacy_manager_service", ] diff --git a/services/common/window_manager/BUILD.gn b/services/common/window_manager/BUILD.gn index 537b933d6..19583815a 100644 --- a/services/common/window_manager/BUILD.gn +++ b/services/common/window_manager/BUILD.gn @@ -28,7 +28,7 @@ ohos_shared_library("accesstoken_window_manager") { include_dirs = [ "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "include", ] diff --git a/services/common/window_manager/test/BUILD.gn b/services/common/window_manager/test/BUILD.gn index 1e5f581d6..0c372e785 100644 --- a/services/common/window_manager/test/BUILD.gn +++ b/services/common/window_manager/test/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("libwindow_manager_test") { include_dirs = [ "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "${access_token_path}/services/common/window_manager/include", ] diff --git a/services/el5filekeymanager/BUILD.gn b/services/el5filekeymanager/BUILD.gn index 240f58172..0af10abc0 100644 --- a/services/el5filekeymanager/BUILD.gn +++ b/services/el5filekeymanager/BUILD.gn @@ -65,8 +65,8 @@ if (is_standard_system && ability_base_enable == true) { ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", "${access_token_path}/interfaces/innerkits/el5filekeymanager:el5_filekey_manager_sdk", "${access_token_path}/services/el5filekeymanager:el5_filekey_manager_cfg", ] diff --git a/services/el5filekeymanager/test/BUILD.gn b/services/el5filekeymanager/test/BUILD.gn index 5de7c08da..a6341a6c8 100644 --- a/services/el5filekeymanager/test/BUILD.gn +++ b/services/el5filekeymanager/test/BUILD.gn @@ -43,10 +43,10 @@ if (is_standard_system && ability_base_enable == true) { configs = [ "${access_token_path}/config:coverage_flags" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/interfaces/innerkits/el5filekeymanager:el5_filekey_manager_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", "//third_party/googletest:gtest_main", ] @@ -107,10 +107,10 @@ if (is_standard_system && ability_base_enable == true) { configs = [ "${access_token_path}/config:coverage_flags" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/interfaces/innerkits/el5filekeymanager:el5_filekey_manager_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", "//third_party/googletest:gtest_main", ] @@ -171,10 +171,10 @@ if (is_standard_system && ability_base_enable == true) { configs = [ "${access_token_path}/config:coverage_flags" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/interfaces/innerkits/el5filekeymanager:el5_filekey_manager_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", "//third_party/googletest:gtest_main", ] diff --git a/services/privacymanager/BUILD.gn b/services/privacymanager/BUILD.gn index bf928778f..969ca71ec 100644 --- a/services/privacymanager/BUILD.gn +++ b/services/privacymanager/BUILD.gn @@ -57,7 +57,7 @@ if (is_standard_system && ability_base_enable == true) { "include/sensitive/camera_manager/", "${access_token_path}/frameworks/privacy/include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "${access_token_path}/frameworks/inner_api/privacy/src", "${access_token_path}/services/common/ability_manager/include", @@ -107,9 +107,9 @@ if (is_standard_system && ability_base_enable == true) { deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", "${access_token_path}/services/common:accesstoken_service_common", "${access_token_path}/services/privacymanager:privacy.rc", ] diff --git a/services/privacymanager/test/coverage/BUILD.gn b/services/privacymanager/test/coverage/BUILD.gn index ae30fad3c..70ccbf8aa 100644 --- a/services/privacymanager/test/coverage/BUILD.gn +++ b/services/privacymanager/test/coverage/BUILD.gn @@ -29,7 +29,7 @@ if (is_standard_system && ability_base_enable == true) { include_dirs = [ "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "${access_token_path}/frameworks/inner_api/privacy/src", "${access_token_path}/services/common/ability_manager/include", @@ -82,11 +82,11 @@ if (is_standard_system && ability_base_enable == true) { deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", "${access_token_path}/services/common:accesstoken_service_common", "${access_token_path}/services/privacymanager:privacy_manager_service", ] diff --git a/services/privacymanager/test/tool/BUILD.gn b/services/privacymanager/test/tool/BUILD.gn index 54e98bf4e..747caa5c7 100644 --- a/services/privacymanager/test/tool/BUILD.gn +++ b/services/privacymanager/test/tool/BUILD.gn @@ -27,7 +27,7 @@ ohos_unittest("CreateCameraWindowTest") { sources = [ "camera_window_create.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", ] external_deps = [ "ability_base:configuration", diff --git a/services/privacymanager/test/unittest/BUILD.gn b/services/privacymanager/test/unittest/BUILD.gn index 78ce4c0fd..4832be00a 100644 --- a/services/privacymanager/test/unittest/BUILD.gn +++ b/services/privacymanager/test/unittest/BUILD.gn @@ -29,7 +29,7 @@ if (is_standard_system && ability_base_enable == true) { include_dirs = [ "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/privacy/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "${access_token_path}/frameworks/inner_api/privacy/src", "${access_token_path}/services/common/ability_manager/include", @@ -86,11 +86,11 @@ if (is_standard_system && ability_base_enable == true) { deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", "${access_token_path}/services/common:accesstoken_service_common", "${access_token_path}/services/privacymanager:privacy_manager_service", ] diff --git a/services/tokensyncmanager/BUILD.gn b/services/tokensyncmanager/BUILD.gn index 1630d590b..97c93a09a 100644 --- a/services/tokensyncmanager/BUILD.gn +++ b/services/tokensyncmanager/BUILD.gn @@ -56,7 +56,7 @@ if (token_sync_enable == true) { "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/services/accesstokenmanager/main/cpp/include/token", "${access_token_path}/services/common/config_policy/include", "${access_token_path}/services/common/handler/include", @@ -100,8 +100,8 @@ if (token_sync_enable == true) { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/services/common:accesstoken_service_common", "${access_token_path}/services/tokensyncmanager:token_sync.rc", ] diff --git a/services/tokensyncmanager/test/coverage/BUILD.gn b/services/tokensyncmanager/test/coverage/BUILD.gn index f047ea9ed..3ae6b83df 100644 --- a/services/tokensyncmanager/test/coverage/BUILD.gn +++ b/services/tokensyncmanager/test/coverage/BUILD.gn @@ -57,9 +57,9 @@ ohos_unittest("libtoken_sync_service_coverage_test") { "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/nativetoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", "${access_token_path}/services/accesstokenmanager/main/cpp/include/token", "${access_token_path}/services/common/config_policy/include", "${access_token_path}/services/common/handler/include", @@ -68,8 +68,8 @@ ohos_unittest("libtoken_sync_service_coverage_test") { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", "${access_token_path}/services/common:accesstoken_service_common", ] diff --git a/services/tokensyncmanager/test/unittest/BUILD.gn b/services/tokensyncmanager/test/unittest/BUILD.gn index d3c771c7c..c88f2effe 100644 --- a/services/tokensyncmanager/test/unittest/BUILD.gn +++ b/services/tokensyncmanager/test/unittest/BUILD.gn @@ -57,9 +57,9 @@ ohos_unittest("libtoken_sync_service_standard_test") { "${access_token_path}/frameworks/common/include", "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/nativetoken/include", - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", "${access_token_path}/services/accesstokenmanager/main/cpp/include/token", "${access_token_path}/services/common/config_policy/include", "${access_token_path}/services/common/handler/include", @@ -68,8 +68,8 @@ ohos_unittest("libtoken_sync_service_standard_test") { deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/services/common:accesstoken_service_common", ] diff --git a/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/BUILD.gn index 9941ae7c3..d315a4bc9 100644 --- a/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/allochaptoken_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("AllocHapTokenFuzzTest") { fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -32,7 +32,7 @@ ohos_fuzztest("AllocHapTokenFuzzTest") { sources = [ "allochaptoken_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/alloclocaltokenid_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/alloclocaltokenid_fuzzer/BUILD.gn index 60b3f54a5..e2adb93fb 100644 --- a/test/fuzztest/innerkits/accesstoken/alloclocaltokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/alloclocaltokenid_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("AllocLocalTokenIDFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("AllocLocalTokenIDFuzzTest") { sources = [ "alloclocaltokenid_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/clearusergrantedpermissionstate_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/clearusergrantedpermissionstate_fuzzer/BUILD.gn index 460d5c90e..08d5e1f06 100644 --- a/test/fuzztest/innerkits/accesstoken/clearusergrantedpermissionstate_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/clearusergrantedpermissionstate_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("ClearUserGrantedPermissionStateFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("ClearUserGrantedPermissionStateFuzzTest") { sources = [ "clearusergrantedpermissionstate_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/deleteremotedevicetokens_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/deleteremotedevicetokens_fuzzer/BUILD.gn index 1cc8bcbbc..dbffb6b58 100644 --- a/test/fuzztest/innerkits/accesstoken/deleteremotedevicetokens_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/deleteremotedevicetokens_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("DeleteRemoteDeviceTokensFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("DeleteRemoteDeviceTokensFuzzTest") { sources = [ "deleteremotedevicetokens_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] if (token_sync_enable == true) { diff --git a/test/fuzztest/innerkits/accesstoken/deleteremotetoken_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/deleteremotetoken_fuzzer/BUILD.gn index 2937d5c6d..00fedcfc8 100644 --- a/test/fuzztest/innerkits/accesstoken/deleteremotetoken_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/deleteremotetoken_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("DeleteRemoteTokenFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("DeleteRemoteTokenFuzzTest") { sources = [ "deleteremotetoken_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] if (token_sync_enable == true) { diff --git a/test/fuzztest/innerkits/accesstoken/deletetoken_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/deletetoken_fuzzer/BUILD.gn index 4e4f4e055..93349c41f 100644 --- a/test/fuzztest/innerkits/accesstoken/deletetoken_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/deletetoken_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("DeleteTokenFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("DeleteTokenFuzzTest") { sources = [ "deletetoken_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/dumptokeninfo_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/dumptokeninfo_fuzzer/BUILD.gn index 0ab50a78f..0f3fe15e6 100644 --- a/test/fuzztest/innerkits/accesstoken/dumptokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/dumptokeninfo_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("DumpTokenInfoFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("DumpTokenInfoFuzzTest") { sources = [ "dumptokeninfo_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getdefpermission_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getdefpermission_fuzzer/BUILD.gn index 838fa2cd7..71736e614 100644 --- a/test/fuzztest/innerkits/accesstoken/getdefpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getdefpermission_fuzzer/BUILD.gn @@ -31,7 +31,7 @@ ohos_fuzztest("GetDefPermissionFuzzTest") { sources = [ "getdefpermission_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getdefpermissions_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getdefpermissions_fuzzer/BUILD.gn index 821045397..a28cca83e 100644 --- a/test/fuzztest/innerkits/accesstoken/getdefpermissions_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getdefpermissions_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetDefPermissionsFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -30,7 +30,7 @@ ohos_fuzztest("GetDefPermissionsFuzzTest") { ] sources = [ "getdefpermissions_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/gethapdlpflag_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/gethapdlpflag_fuzzer/BUILD.gn index c41c81f2a..014dcbcc0 100644 --- a/test/fuzztest/innerkits/accesstoken/gethapdlpflag_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/gethapdlpflag_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetHapDlpFlagFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetHapDlpFlagFuzzTest") { sources = [ "gethapdlpflag_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/gethaptokenid_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/gethaptokenid_fuzzer/BUILD.gn index 73d806a7c..f3aa7332a 100644 --- a/test/fuzztest/innerkits/accesstoken/gethaptokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/gethaptokenid_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetHapTokenIDFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -30,7 +30,7 @@ ohos_fuzztest("GetHapTokenIDFuzzTest") { ] sources = [ "gethaptokenid_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] external_deps = [ "c_utils:utils", diff --git a/test/fuzztest/innerkits/accesstoken/gethaptokeninfo_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/gethaptokeninfo_fuzzer/BUILD.gn index 7af3227ee..5f57f72c6 100644 --- a/test/fuzztest/innerkits/accesstoken/gethaptokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/gethaptokeninfo_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetHapTokenInfoFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetHapTokenInfoFuzzTest") { sources = [ "gethaptokeninfo_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/gethaptokeninfofromremote_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/gethaptokeninfofromremote_fuzzer/BUILD.gn index a84e96e5f..65f22e394 100644 --- a/test/fuzztest/innerkits/accesstoken/gethaptokeninfofromremote_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/gethaptokeninfofromremote_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetHapTokenInfoFromRemoteFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetHapTokenInfoFromRemoteFuzzTest") { sources = [ "gethaptokeninfofromremote_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] if (token_sync_enable == true) { diff --git a/test/fuzztest/innerkits/accesstoken/getnativetokenid_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getnativetokenid_fuzzer/BUILD.gn index c93ad2e74..96574efef 100644 --- a/test/fuzztest/innerkits/accesstoken/getnativetokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getnativetokenid_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetNativeTokenIdFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetNativeTokenIdFuzzTest") { sources = [ "getnativetokenid_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getnativetokeninfo_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getnativetokeninfo_fuzzer/BUILD.gn index fc8c8a2ff..68e23de26 100644 --- a/test/fuzztest/innerkits/accesstoken/getnativetokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getnativetokeninfo_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetNativeTokenInfoFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -30,7 +30,7 @@ ohos_fuzztest("GetNativeTokenInfoFuzzTest") { ] sources = [ "getnativetokeninfo_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getpermissionflags_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getpermissionflags_fuzzer/BUILD.gn index 5a41ba5fa..21202fe3b 100644 --- a/test/fuzztest/innerkits/accesstoken/getpermissionflags_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getpermissionflags_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetPermissionFlagsFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetPermissionFlagsFuzzTest") { sources = [ "getpermissionflags_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getpermissionrequesttogglestatus_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getpermissionrequesttogglestatus_fuzzer/BUILD.gn index 7619b0726..587ecd0a2 100644 --- a/test/fuzztest/innerkits/accesstoken/getpermissionrequesttogglestatus_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getpermissionrequesttogglestatus_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetPermissionRequestToggleStatusFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetPermissionRequestToggleStatusFuzzTest") { sources = [ "getpermissionrequesttogglestatus_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/BUILD.gn index 820f8e6de..7a261c80f 100644 --- a/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getpermissionsstatus_fuzzer/BUILD.gn @@ -19,8 +19,8 @@ ohos_fuzztest("GetPermissionsStatusFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/nativetoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", ] cflags = [ "-g", @@ -30,9 +30,9 @@ ohos_fuzztest("GetPermissionsStatusFuzzTest") { ] sources = [ "getpermissionsstatus_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getpermissionusedtype_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getpermissionusedtype_fuzzer/BUILD.gn index df46aa9d8..4fb8b3df0 100644 --- a/test/fuzztest/innerkits/accesstoken/getpermissionusedtype_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getpermissionusedtype_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("GetPermissionUsedTypeFuzzTest") { fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -32,7 +32,7 @@ ohos_fuzztest("GetPermissionUsedTypeFuzzTest") { sources = [ "getpermissionusedtype_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getremotenativetokenid_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getremotenativetokenid_fuzzer/BUILD.gn index d9b8326e6..c021b4f6b 100644 --- a/test/fuzztest/innerkits/accesstoken/getremotenativetokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getremotenativetokenid_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetRemoteNativeTokenIDFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetRemoteNativeTokenIDFuzzTest") { sources = [ "getremotenativetokenid_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] if (token_sync_enable == true) { diff --git a/test/fuzztest/innerkits/accesstoken/getrendertokenid_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getrendertokenid_fuzzer/BUILD.gn index 5f9613a30..e15999a2f 100644 --- a/test/fuzztest/innerkits/accesstoken/getrendertokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getrendertokenid_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetRenderTokenIdFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetRenderTokenIdFuzzTest") { sources = [ "getrendertokenid_fuzzer.cpp" ] deps = - [ "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk" ] + [ "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk" ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getreqpermissions_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getreqpermissions_fuzzer/BUILD.gn index d6ec4b118..0a3cbd43b 100644 --- a/test/fuzztest/innerkits/accesstoken/getreqpermissions_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getreqpermissions_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetReqPermissionsFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -30,7 +30,7 @@ ohos_fuzztest("GetReqPermissionsFuzzTest") { ] sources = [ "getreqpermissions_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/getselfpermissionsstate_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/getselfpermissionsstate_fuzzer/BUILD.gn index 805d07425..bf5732a26 100644 --- a/test/fuzztest/innerkits/accesstoken/getselfpermissionsstate_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/getselfpermissionsstate_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetSelfPermissionsStateFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -30,7 +30,7 @@ ohos_fuzztest("GetSelfPermissionsStateFuzzTest") { ] sources = [ "getselfpermissionsstate_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/gettokentype_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/gettokentype_fuzzer/BUILD.gn index 5024e0918..16b7f4a87 100644 --- a/test/fuzztest/innerkits/accesstoken/gettokentype_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/gettokentype_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetTokenTypeFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetTokenTypeFuzzTest") { sources = [ "gettokentype_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/gettokentypeflag_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/gettokentypeflag_fuzzer/BUILD.gn index 67ec0e143..4c0b7726c 100644 --- a/test/fuzztest/innerkits/accesstoken/gettokentypeflag_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/gettokentypeflag_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetTokenTypeFlagFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GetTokenTypeFlagFuzzTest") { sources = [ "gettokentypeflag_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/grantpermission_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/grantpermission_fuzzer/BUILD.gn index 45549a72b..ba3f64d23 100644 --- a/test/fuzztest/innerkits/accesstoken/grantpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/grantpermission_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GrantPermissionFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("GrantPermissionFuzzTest") { sources = [ "grantpermission_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/grantpermissionforspecifiedtime_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/grantpermissionforspecifiedtime_fuzzer/BUILD.gn index 175ec307f..c7c63eaa4 100644 --- a/test/fuzztest/innerkits/accesstoken/grantpermissionforspecifiedtime_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/grantpermissionforspecifiedtime_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("GrantPermissionForSpecifiedTimeFuzzTest") { fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -32,7 +32,7 @@ ohos_fuzztest("GrantPermissionForSpecifiedTimeFuzzTest") { sources = [ "grantpermissionforspecifiedtime_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/BUILD.gn index e2224d387..37e4ef947 100644 --- a/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/inithaptoken_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("InitHapTokenFuzzTest") { fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -32,7 +32,7 @@ ohos_fuzztest("InitHapTokenFuzzTest") { sources = [ "inithaptoken_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/registerpermstatechangecallback_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/registerpermstatechangecallback_fuzzer/BUILD.gn index 016a16639..a24527885 100644 --- a/test/fuzztest/innerkits/accesstoken/registerpermstatechangecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/registerpermstatechangecallback_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("RegisterPermStateChangeCallbackFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -30,7 +30,7 @@ ohos_fuzztest("RegisterPermStateChangeCallbackFuzzTest") { ] sources = [ "registerpermstatechangecallback_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/registertokensynccallback_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/registertokensynccallback_fuzzer/BUILD.gn index 836076e04..7cc1b7871 100644 --- a/test/fuzztest/innerkits/accesstoken/registertokensynccallback_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/registertokensynccallback_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("RegisterTokenSyncCallbackFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = - [ "${access_token_path}/interfaces/innerkits/accesstoken/include" ] + [ "${access_token_path}/interfaces/inner_api/accesstoken/include" ] cflags = [ "-g", "-O0", @@ -28,8 +28,8 @@ ohos_fuzztest("RegisterTokenSyncCallbackFuzzTest") { ] sources = [ "registertokensynccallback_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/revokeusergrantedpermission_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/revokeusergrantedpermission_fuzzer/BUILD.gn index 0809a7321..642a11c2b 100644 --- a/test/fuzztest/innerkits/accesstoken/revokeusergrantedpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/revokeusergrantedpermission_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("RevokeUserGrantedPermissionFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("RevokeUserGrantedPermissionFuzzTest") { sources = [ "revokeusergrantedpermission_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/setpermdialogcap_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/setpermdialogcap_fuzzer/BUILD.gn index 228f85cac..d1d4c86f2 100644 --- a/test/fuzztest/innerkits/accesstoken/setpermdialogcap_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/setpermdialogcap_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("SetPermDialogCapFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("SetPermDialogCapFuzzTest") { sources = [ "setpermdialogcap_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/setpermissionrequesttogglestatus_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/setpermissionrequesttogglestatus_fuzzer/BUILD.gn index 8a1991fa5..af13deac4 100644 --- a/test/fuzztest/innerkits/accesstoken/setpermissionrequesttogglestatus_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/setpermissionrequesttogglestatus_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("SetPermissionRequestToggleStatusFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("SetPermissionRequestToggleStatusFuzzTest") { sources = [ "setpermissionrequesttogglestatus_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/BUILD.gn index 93e4c3506..87946c691 100644 --- a/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/setremotehaptokeninfo_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("SetRemoteHapTokenInfoFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("SetRemoteHapTokenInfoFuzzTest") { sources = [ "setremotehaptokeninfo_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] if (token_sync_enable == true) { diff --git a/test/fuzztest/innerkits/accesstoken/unregisterpermstatechangecallback_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/unregisterpermstatechangecallback_fuzzer/BUILD.gn index 8b9af1fa1..8f84be522 100644 --- a/test/fuzztest/innerkits/accesstoken/unregisterpermstatechangecallback_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/unregisterpermstatechangecallback_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("UnRegisterPermStateChangeCallbackFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -30,7 +30,7 @@ ohos_fuzztest("UnRegisterPermStateChangeCallbackFuzzTest") { ] sources = [ "unregisterpermstatechangecallback_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/unregistertokensynccallback_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/unregistertokensynccallback_fuzzer/BUILD.gn index d55da6283..01e804544 100644 --- a/test/fuzztest/innerkits/accesstoken/unregistertokensynccallback_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/unregistertokensynccallback_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("UnRegisterTokenSyncCallbackFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = - [ "${access_token_path}/interfaces/innerkits/accesstoken/include" ] + [ "${access_token_path}/interfaces/inner_api/accesstoken/include" ] cflags = [ "-g", "-O0", @@ -28,8 +28,8 @@ ohos_fuzztest("UnRegisterTokenSyncCallbackFuzzTest") { ] sources = [ "unregistertokensynccallback_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtoken_setproc", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtoken_setproc", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/BUILD.gn index c45765a96..e57e29ca5 100644 --- a/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/updatehaptoken_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("UpdateHapTokenFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("UpdateHapTokenFuzzTest") { sources = [ "updatehaptoken_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/verifyaccesstoken001_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/verifyaccesstoken001_fuzzer/BUILD.gn index 84e8bd51c..f73fe5bce 100644 --- a/test/fuzztest/innerkits/accesstoken/verifyaccesstoken001_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/verifyaccesstoken001_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("VerifyAccessToken001FuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("VerifyAccessToken001FuzzTest") { sources = [ "verifyaccesstoken001_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/accesstoken/verifyaccesstoken_fuzzer/BUILD.gn b/test/fuzztest/innerkits/accesstoken/verifyaccesstoken_fuzzer/BUILD.gn index 35127ce11..e019449f6 100644 --- a/test/fuzztest/innerkits/accesstoken/verifyaccesstoken_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/accesstoken/verifyaccesstoken_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("VerifyAccessTokenFuzzTest") { module_out_path = module_output_path_interface_access_token fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ @@ -31,7 +31,7 @@ ohos_fuzztest("VerifyAccessTokenFuzzTest") { sources = [ "verifyaccesstoken_fuzzer.cpp" ] deps = [ - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/innerkits/privacy/addpermissionusedrecord_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/addpermissionusedrecord_fuzzer/BUILD.gn index a0e8d0ded..03f235417 100644 --- a/test/fuzztest/innerkits/privacy/addpermissionusedrecord_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/addpermissionusedrecord_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("AddPermissionUsedRecordFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/getpermissionusedrecords_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/getpermissionusedrecords_fuzzer/BUILD.gn index 1ee2700f5..f0f11a411 100644 --- a/test/fuzztest/innerkits/privacy/getpermissionusedrecords_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/getpermissionusedrecords_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetPermissionUsedRecordsFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/getpermissionusedtypeinfos_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/getpermissionusedtypeinfos_fuzzer/BUILD.gn index 267496d93..4f56906f7 100644 --- a/test/fuzztest/innerkits/privacy/getpermissionusedtypeinfos_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/getpermissionusedtypeinfos_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetPermissionUsedTypeInfosFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/getseccompenhance_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/getseccompenhance_fuzzer/BUILD.gn index 5ed6f674c..6770b7553 100644 --- a/test/fuzztest/innerkits/privacy/getseccompenhance_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/getseccompenhance_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetSecCompEnhanceFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/getspecialseccompenhance_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/getspecialseccompenhance_fuzzer/BUILD.gn index e64309012..97b7a338e 100644 --- a/test/fuzztest/innerkits/privacy/getspecialseccompenhance_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/getspecialseccompenhance_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("GetSpecialSecCompEnhanceFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/isallowedusingpermission_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/isallowedusingpermission_fuzzer/BUILD.gn index ba01a266f..abba6cbe9 100644 --- a/test/fuzztest/innerkits/privacy/isallowedusingpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/isallowedusingpermission_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("IsAllowedUsingPermissionFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/registerpermactivestatuscallback_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/registerpermactivestatuscallback_fuzzer/BUILD.gn index ed8a0de2d..7932fd1de 100644 --- a/test/fuzztest/innerkits/privacy/registerpermactivestatuscallback_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/registerpermactivestatuscallback_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("RegisterPermActiveStatusCallbackFuzzTest") { fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/registerseccompenhance_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/registerseccompenhance_fuzzer/BUILD.gn index 20ebd1be1..7e31cf57e 100644 --- a/test/fuzztest/innerkits/privacy/registerseccompenhance_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/registerseccompenhance_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("RegisterSecCompEnhanceFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/removepermissionusedrecords_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/removepermissionusedrecords_fuzzer/BUILD.gn index 0b29d11f9..176c4068c 100644 --- a/test/fuzztest/innerkits/privacy/removepermissionusedrecords_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/removepermissionusedrecords_fuzzer/BUILD.gn @@ -20,7 +20,7 @@ ohos_fuzztest("RemovePermissionUsedRecordsFuzzTest") { fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/setmutepolicy_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/setmutepolicy_fuzzer/BUILD.gn index bbd7633d9..2bebac6a0 100644 --- a/test/fuzztest/innerkits/privacy/setmutepolicy_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/setmutepolicy_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("SetMutePolicyFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/startusingpermission001_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/startusingpermission001_fuzzer/BUILD.gn index dea842aec..03c7e6f09 100644 --- a/test/fuzztest/innerkits/privacy/startusingpermission001_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/startusingpermission001_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("StartUsingPermission001FuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/startusingpermission_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/startusingpermission_fuzzer/BUILD.gn index d492bf6ee..2ff16a393 100644 --- a/test/fuzztest/innerkits/privacy/startusingpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/startusingpermission_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("StartUsingPermissionFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/stopusingpermission_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/stopusingpermission_fuzzer/BUILD.gn index 4979ed848..8d9c39176 100644 --- a/test/fuzztest/innerkits/privacy/stopusingpermission_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/stopusingpermission_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("StopUsingPermissionFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/unregisterpermactivestatuscallback_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/unregisterpermactivestatuscallback_fuzzer/BUILD.gn index ff6d44797..3bd68b510 100644 --- a/test/fuzztest/innerkits/privacy/unregisterpermactivestatuscallback_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/unregisterpermactivestatuscallback_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("UnRegisterPermActiveStatusCallbackFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/innerkits/privacy/updateseccompenhance_fuzzer/BUILD.gn b/test/fuzztest/innerkits/privacy/updateseccompenhance_fuzzer/BUILD.gn index 75a07bc0d..6a19c99f3 100644 --- a/test/fuzztest/innerkits/privacy/updateseccompenhance_fuzzer/BUILD.gn +++ b/test/fuzztest/innerkits/privacy/updateseccompenhance_fuzzer/BUILD.gn @@ -19,7 +19,7 @@ ohos_fuzztest("UpdateSecCompEnhanceFuzzTest") { module_out_path = module_output_path_interface_privacy fuzz_config_file = "." include_dirs = [ - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/test/fuzztest/common", ] cflags = [ diff --git a/test/fuzztest/services/accesstoken/access_token_service_fuzz.gni b/test/fuzztest/services/accesstoken/access_token_service_fuzz.gni index 463030ab4..fc875f352 100644 --- a/test/fuzztest/services/accesstoken/access_token_service_fuzz.gni +++ b/test/fuzztest/services/accesstoken/access_token_service_fuzz.gni @@ -39,19 +39,19 @@ access_token_include_dirs = [ "${access_token_path}/services/common/random/include", "${access_token_path}/services/common/utils/include", "${access_token_path}/frameworks/tokensync/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", - "${access_token_path}/interfaces/innerkits/nativetoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", "${access_token_path}/test/fuzztest/common", ] access_token_deps = [ "${access_token_path}/frameworks/accesstoken:accesstoken_communication_adapter_cxx", "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libperm_setproc", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", + "${access_token_path}/frameworks/inner_api/token_setproc:libperm_setproc", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/services/accesstokenmanager:access_token.rc", "${access_token_path}/services/accesstokenmanager/etc:param_files", "${access_token_path}/services/common:accesstoken_service_common", diff --git a/test/fuzztest/services/accesstoken/getaccesstokenid_fuzzer/BUILD.gn b/test/fuzztest/services/accesstoken/getaccesstokenid_fuzzer/BUILD.gn index 2dd78b94b..2656e3479 100644 --- a/test/fuzztest/services/accesstoken/getaccesstokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/services/accesstoken/getaccesstokenid_fuzzer/BUILD.gn @@ -29,11 +29,11 @@ ohos_fuzztest("GetAccessTokenIdFuzzTest") { ] include_dirs = [ - "${access_token_path}/interfaces/innerkits/nativetoken/include", + "${access_token_path}/interfaces/inner_api/nativetoken/include", "${access_token_path}/test/fuzztest/common", ] - deps = [ "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared" ] + deps = [ "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared" ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/BUILD.gn b/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/BUILD.gn index 389e032db..406bdaa82 100644 --- a/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/accesstoken/getpermissionsstatusstub_fuzzer/BUILD.gn @@ -32,7 +32,7 @@ ohos_fuzztest("GetPermissionsStatusStubFuzzTest") { include_dirs = access_token_include_dirs deps = access_token_deps - deps += [ "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared" ] + deps += [ "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared" ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/services/accesstoken/registerpermstatechangecallbackstub_fuzzer/BUILD.gn b/test/fuzztest/services/accesstoken/registerpermstatechangecallbackstub_fuzzer/BUILD.gn index 155806b69..81c18f331 100644 --- a/test/fuzztest/services/accesstoken/registerpermstatechangecallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/accesstoken/registerpermstatechangecallbackstub_fuzzer/BUILD.gn @@ -45,6 +45,8 @@ ohos_fuzztest("RegisterPermStateChangeCallbackStubFuzzTest") { sources += access_token_impl_sources - include_dirs += - [ "${access_token_path}/interfaces/innerkits/accesstoken/src" ] + include_dirs += [ + "${access_token_path}/interfaces/inner_api/accesstoken/src", + "${access_token_path}/frameworks/inner_api/accesstoken/src", + ] } diff --git a/test/fuzztest/services/accesstoken/setfirstcallertokenid_fuzzer/BUILD.gn b/test/fuzztest/services/accesstoken/setfirstcallertokenid_fuzzer/BUILD.gn index 20b2a822c..890a207c3 100644 --- a/test/fuzztest/services/accesstoken/setfirstcallertokenid_fuzzer/BUILD.gn +++ b/test/fuzztest/services/accesstoken/setfirstcallertokenid_fuzzer/BUILD.gn @@ -29,11 +29,11 @@ ohos_fuzztest("SetFirstCallerTokenIDFuzzTest") { ] include_dirs = [ - "${access_token_path}/interfaces/innerkits/token_setproc/include", + "${access_token_path}/interfaces/inner_api/token_setproc/include", "${access_token_path}/test/fuzztest/common", ] - deps = [ "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared" ] + deps = [ "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared" ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/BUILD.gn b/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/BUILD.gn index 81f75417d..318156912 100644 --- a/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/BUILD.gn +++ b/test/fuzztest/services/accesstoken/setpermdialogcap_fuzzer/BUILD.gn @@ -31,7 +31,7 @@ ohos_fuzztest("SetPermDialogCapFuzzTest") { include_dirs = access_token_include_dirs deps = access_token_deps - deps += [ "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared" ] + deps += [ "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared" ] configs = [ "${access_token_path}/config:coverage_flags" ] diff --git a/test/fuzztest/services/accesstoken/unregisterpermstatechangecallbackstub_fuzzer/BUILD.gn b/test/fuzztest/services/accesstoken/unregisterpermstatechangecallbackstub_fuzzer/BUILD.gn index 87dc63f3e..e421feed4 100644 --- a/test/fuzztest/services/accesstoken/unregisterpermstatechangecallbackstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/accesstoken/unregisterpermstatechangecallbackstub_fuzzer/BUILD.gn @@ -47,6 +47,6 @@ ohos_fuzztest("UnRegisterPermStateChangeCallbackStubFuzzTest") { if (token_sync_enable == true) { include_dirs += - [ "${access_token_path}/interfaces/innerkits/accesstoken/src" ] + [ "${access_token_path}/interfaces/inner_api/accesstoken/src" ] } } diff --git a/test/fuzztest/services/privacy/privacy_service_fuzz.gni b/test/fuzztest/services/privacy/privacy_service_fuzz.gni index 8656d868d..c7844fb8d 100644 --- a/test/fuzztest/services/privacy/privacy_service_fuzz.gni +++ b/test/fuzztest/services/privacy/privacy_service_fuzz.gni @@ -18,7 +18,7 @@ privacy_include_dirs = [ "${access_token_path}/frameworks/accesstoken/include", "${access_token_path}/frameworks/privacy/include", "${access_token_path}/frameworks/common/include", - "${access_token_path}/interfaces/innerkits/accesstoken/include", + "${access_token_path}/interfaces/inner_api/accesstoken/include", "${access_token_path}/interfaces/inner_api/privacy/include", "${access_token_path}/frameworks/inner_api/privacy/src", "${access_token_path}/services/privacymanager/include/active", @@ -43,10 +43,10 @@ privacy_include_dirs = [ privacy_deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", + "${access_token_path}/frameworks/inner_api/accesstoken:libtokenid_sdk", + "${access_token_path}/frameworks/inner_api/token_setproc:libtokensetproc_shared", "${access_token_path}/frameworks/privacy:privacy_communication_adapter_cxx", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libtokenid_sdk", - "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", "${access_token_path}/services/common:accesstoken_service_common", ] diff --git a/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/BUILD.gn b/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/BUILD.gn index b6c38befc..4901cbaf3 100644 --- a/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/privacy/sethapwithfgreminderstub_fuzzer/BUILD.gn @@ -40,7 +40,7 @@ ohos_fuzztest("SetHapWithFGReminderStubFuzzTest") { cflags_cc = privacy_cflags_cc deps = privacy_deps - deps += [ "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared" ] + deps += [ "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared" ] external_deps = privacy_external_deps } diff --git a/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/BUILD.gn b/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/BUILD.gn index f278054a8..574ff2089 100644 --- a/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/BUILD.gn +++ b/test/fuzztest/services/privacy/setmutepolicystub_fuzzer/BUILD.gn @@ -40,7 +40,7 @@ ohos_fuzztest("SetMutePolicyStubFuzzTest") { cflags_cc = privacy_cflags_cc deps = privacy_deps - deps += [ "${access_token_path}/interfaces/innerkits/nativetoken:libnativetoken_shared" ] + deps += [ "${access_token_path}/frameworks/inner_api/nativetoken:libnativetoken_shared" ] external_deps = privacy_external_deps } diff --git a/tools/accesstoken/BUILD.gn b/tools/accesstoken/BUILD.gn index 91cff198b..dad3718d8 100644 --- a/tools/accesstoken/BUILD.gn +++ b/tools/accesstoken/BUILD.gn @@ -32,8 +32,8 @@ ohos_executable("atm") { deps = [ "${access_token_path}/frameworks/common:accesstoken_common_cxx", + "${access_token_path}/frameworks/inner_api/accesstoken:libaccesstoken_sdk", "${access_token_path}/frameworks/inner_api/privacy:libprivacy_sdk", - "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", ] cflags = [] -- Gitee