From 71654becf9d2dc4a7b4e0acd893c9654eb2e8487 Mon Sep 17 00:00:00 2001 From: luowei Date: Mon, 3 Mar 2025 10:59:54 +0800 Subject: [PATCH 1/2] =?UTF-8?q?sa=E7=AC=A6=E5=8F=B7=E4=BC=98=E5=8C=96=5Flu?= =?UTF-8?q?owei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: luowei --- frameworks/accesstoken/BUILD.gn | 6 ++ .../accesstoken_communication_adapter_cxx.map | 61 +++++++++++++++++++ frameworks/common/BUILD.gn | 5 ++ frameworks/common/accesstoken_common_cxx.map | 58 ++++++++++++++++++ frameworks/js/napi/accesstoken/BUILD.gn | 6 ++ .../napi/accesstoken/libabilityaccessctrl.map | 20 ++++++ frameworks/js/napi/el5filekeymanager/BUILD.gn | 5 ++ .../screenlockfilemanager.map | 20 ++++++ frameworks/js/napi/privacy/BUILD.gn | 5 ++ .../js/napi/privacy/libprivacymanager.map | 20 ++++++ frameworks/privacy/BUILD.gn | 5 ++ .../privacy_communication_adapter_cxx.map | 38 ++++++++++++ .../inner_api/el5filekeymanager/BUILD.gn | 5 ++ .../el5_filekey_manager_sdk.map | 26 ++++++++ interfaces/innerkits/accesstoken/BUILD.gn | 5 ++ .../innerkits/accesstoken/libtokenid_sdk.map | 22 +++++++ interfaces/innerkits/analysis_model/BUILD.gn | 6 ++ .../libcodesignature_analysis.map | 20 ++++++ interfaces/innerkits/nativetoken/BUILD.gn | 3 + interfaces/innerkits/token_setproc/BUILD.gn | 5 ++ .../token_setproc/libtokensetproc_shared.map | 21 +++++++ interfaces/innerkits/tokensync/BUILD.gn | 3 + interfaces/kits/capi/accesstoken/BUILD.gn | 2 + interfaces/kits/cj/accesstoken/BUILD.gn | 3 + .../kits/cj/screenlockfilemanager/BUILD.gn | 3 + services/common/ability_manager/BUILD.gn | 3 + services/common/app_manager/BUILD.gn | 3 + services/common/screenlock_manager/BUILD.gn | 3 + 28 files changed, 382 insertions(+) create mode 100644 frameworks/accesstoken/accesstoken_communication_adapter_cxx.map create mode 100644 frameworks/common/accesstoken_common_cxx.map create mode 100644 frameworks/js/napi/accesstoken/libabilityaccessctrl.map create mode 100644 frameworks/js/napi/el5filekeymanager/screenlockfilemanager.map create mode 100644 frameworks/js/napi/privacy/libprivacymanager.map create mode 100644 frameworks/privacy/privacy_communication_adapter_cxx.map create mode 100644 interfaces/inner_api/el5filekeymanager/el5_filekey_manager_sdk.map create mode 100644 interfaces/innerkits/accesstoken/libtokenid_sdk.map create mode 100644 interfaces/innerkits/analysis_model/libcodesignature_analysis.map create mode 100644 interfaces/innerkits/token_setproc/libtokensetproc_shared.map diff --git a/frameworks/accesstoken/BUILD.gn b/frameworks/accesstoken/BUILD.gn index 905cf9753..50ed52fab 100644 --- a/frameworks/accesstoken/BUILD.gn +++ b/frameworks/accesstoken/BUILD.gn @@ -35,6 +35,12 @@ ohos_shared_library("accesstoken_communication_adapter_cxx") { cfi_cross_dso = true debug = false } + + if(!use_clang_coverage) + { + version_script = "accesstoken_communication_adapter_cxx.map" + } + branch_protector_ret = "pac_ret" public_configs = [ ":accesstoken_communication_adapter_cxx_public_config" ] diff --git a/frameworks/accesstoken/accesstoken_communication_adapter_cxx.map b/frameworks/accesstoken/accesstoken_communication_adapter_cxx.map new file mode 100644 index 000000000..66b1c315a --- /dev/null +++ b/frameworks/accesstoken/accesstoken_communication_adapter_cxx.map @@ -0,0 +1,61 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + "VVT for OHOS::Security::AccessToken::HapTokenInfoForSyncParcel"; + "vtable for OHOS::Security::AccessToken::HapTokenInfoForSyncParcel"; + "VTT for OHOS::Security::AccessToken::PermissionDefParcel"; + "vtable for OHOS::Security::AccessToken::PermissionDefParcel"; + "VTT for OHOS::Security::AccessToken::PermissionListStateParcel"; + "vtable for OHOS::Security::AccessToken::PermissionListStateParcel"; + "VTT for OHOS::Security::AccessToken::PermissionGrantInfoParcel"; + "vtable for OHOS::Security::AccessToken::PermissionGrantInfoParcel"; + "VTT for OHOS::Security::AccessToken::PermStateChangeScopeParcel"; + "vtable for OHOS::Security::AccessToken::PermStateChangeScopeParcel"； + "VTT for OHOS::Security::AccessToken::HapInfoParcel"; + "vtable for OHOS::Security::AccessToken::HapInfoParcel"; + "VTT for OHOS::Security::AccessToken::HapPolicyParcel"; + "vtable for OHOS::Security::AccessToken::HapPolicyParcel"; + "VTT for OHOS::Security::AccessToken::HapTokenInfoParcel"; + "vtable for OHOS::Security::AccessToken::HapTokenInfoParcel"; + "VTT for OHOS::Security::AccessToken::NativeTokenInfoParcel"; + "vtable for OHOS::Security::AccessToken::NativeTokenInfoParcel"; + "VTT for OHOS::Security::AccessToken::AtmToolsParamInfoParcel"; + "vtable for OHOS::Security::AccessToken::AtmToolsParamInfoParcel"; + "VTT for OHOS::Security::AccessToken::HapBaseInfoParcel"; + "vtable for OHOS::Security::AccessToken::HapBaseInfoParcel"; + "VTT for OHOS::Security::AccessToken::PermissionStatusParcel"; + "vtable for OHOS::Security::AccessToken::PermissionStatusParcel"; + "VTT for OHOS::Security::AccessToken::PermissionStateChangeInfoParcel"; + "vtable for OHOS::Security::AccessToken::PermissionStateChangeInfoParcel"; + "OHOS::Security::AccessToken::HapTokenInfoForSyncParcel"; + "OHOS::Security::AccessToken::PermissionDefParcel"; + "OHOS::Security::AccessToken::PermissionStateChangeInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::HapTokenInfoForSyncParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionStateChangeInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::HapTokenInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::NativeTokenInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionListStateParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionStatusParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionDefParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::HapInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::HapPolicyParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermStateChangeScopeParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::HapBaseInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::AtmToolsParamInfoParcel::Unmarshalling(OHOS::Parcel&)"; + }; + local: + *; +}; \ No newline at end of file diff --git a/frameworks/common/BUILD.gn b/frameworks/common/BUILD.gn index 84a20c2c2..21037feca 100644 --- a/frameworks/common/BUILD.gn +++ b/frameworks/common/BUILD.gn @@ -31,6 +31,11 @@ ohos_shared_library("accesstoken_common_cxx") { cfi_cross_dso = true debug = false } + + if (!use_clang_coverage) { + version_script = "accesstoken_common_cxx.map" + } + branch_protector_ret = "pac_ret" public_configs = [ ":accesstoken_common_cxx_public_config" ] diff --git a/frameworks/common/accesstoken_common_cxx.map b/frameworks/common/accesstoken_common_cxx.map new file mode 100644 index 000000000..bcbf4a036 --- /dev/null +++ b/frameworks/common/accesstoken_common_cxx.map @@ -0,0 +1,58 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + "OHOS::Security::AccessToken::ConstantCommon::EncryptDevId(std::__h::basic_string, std::__h::allocator>)"; + "OHOS::Security::AccessToken::TimeUtil::GetCurrentTimestamp()"; + "OHOS::Security::AccessToken::FindAndInsertRecord(OHOS::Security::AccessToken::AddPermParamInfo const&)"; + "OHOS::Security::AccessToken::DataValidator::IsPermissionNameValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::DataValidator::IsPermissionUsedTypeValid(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsTokenIDValid(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsHapCaller(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsUserIdValid(int)"; + "OHOS::Security::AccessToken::DataValidator::IsPermissionUsedFlagValid(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsPolicyTypeValid(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsCallerTypeValid(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsAppIDDescValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::DataValidator::IsBundleNameValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::DataValidator::IsAplNumValid(int)"; + "OHOS::Security::AccessToken::DataValidator::IsDomainValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::DataValidator::IsDlpTypeValid(int)"; + "OHOS::Security::AccessToken::TransferPermissionToOpcode(std::__h::basic_string, std::__h::allocator> const&, unsigned int&)"; + "OHOS::Security::AccessToken::DataValidator::IsPermissionFlagValid(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsToggleStatusValid(unsigned int)"; + "OHOS::Security::AccessToken::DataValidator::IsProcessNameValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::JsonParser::IsDirExsit(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::JsonParser::GetStringFromJson(nlohmann::json_abi_v3_11_2::basic_json, std::__h::allocator>, bool, long, unsigned long, double, std::__h::allocator, nlohmann::json_abi_v3_11_2::adl_serializer, std::__h::vector>> const&, std::__h::basic_string, std::__h::allocator> const&, std::__h::basic_string, std::__h::allocator>&)"; + "OHOS::Security::AccessToken::JsonParser::GetIntFromJson(nlohmann::json_abi_v3_11_2::basic_json, std::__h::allocator>, bool, long, unsigned long, double, std::__h::allocator, nlohmann::json_abi_v3_11_2::adl_serializer, std::__h::vector>> const&, std::__h::basic_string, std::__h::allocator> const&, int&)"; + "OHOS::Security::AccessToken::JsonParser::ReadCfgFile(std::__h::basic_string, std::__h::allocator> const&, std::__h::basic_string, std::__h::allocator>&)"; + "OHOS::Security::AccessToken::DataValidator::IsDeviceIdValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::ConstantCommon::GetLocalDeviceId()"; + "OHOS::Security::AccessToken::TransferOpcodeToPermission(unsigned int, std::__h::basic_string, std::__h::allocator>&)"; + "OHOS::Security::AccessToken::ConstantCommon::GetFlagWithoutSpecifiedElement(unsigned int, unsigned int)"; + "OHOS::Security::AccessToken::ConstantCommon::IsPermOperatedByUser(int)"; + "OHOS::Security::AccessToken::ConstantCommon::IsPermOperatedBySystem(int)"; + "OHOS::Security::AccessToken::ConstantCommon::IsPermGrantedBySecComp(int)"; + "OHOS::Security::AccessToken::JsonParser::GetBoolFromJson(nlohmann::json_abi_v3_11_2::basic_json, std::__h::allocator>, bool, long, unsigned long, double, std::__h::allocator, nlohmann::json_abi_v3_11_2::adl_serializer, std::__h::vector>> const&, std::__h::basic_string, std::__h::allocator> const&, bool&)"; + "OHOS::Security::AccessToken::DataValidator::IsLabelValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::DataValidator::IsAvailableTypeValid(int)"; + "OHOS::Security::AccessToken::JsonParser::GetUnsignedIntFromJson(nlohmann::json_abi_v3_11_2::basic_json, std::__h::allocator>, bool, long, unsigned long, double, std::__h::allocator, nlohmann::json_abi_v3_11_2::adl_serializer, std::__h::vector>> const&, std::__h::basic_string, std::__h::allocator> const&, unsigned int&)"; + "OHOS::Security::AccessToken::DataValidator::IsDescValid(std::__h::basic_string, std::__h::allocator> const&)"; + "OHOS::Security::AccessToken::TimeUtil::IsTimeStampsSameMinute(long, long)"; + ""; + }; + local: + *; +}; \ No newline at end of file diff --git a/frameworks/js/napi/accesstoken/BUILD.gn b/frameworks/js/napi/accesstoken/BUILD.gn index 6cebe5c4c..50d826964 100644 --- a/frameworks/js/napi/accesstoken/BUILD.gn +++ b/frameworks/js/napi/accesstoken/BUILD.gn @@ -20,6 +20,12 @@ ohos_shared_library("libabilityaccessctrl") { cfi_cross_dso = true debug = false } + + if (!use_clang_coverage) { + version_script = "libabilityaccessctrl.map" + shlib_type = "sa" + } + branch_protector_ret = "pac_ret" include_dirs = [ "${access_token_path}/frameworks/common/include", diff --git a/frameworks/js/napi/accesstoken/libabilityaccessctrl.map b/frameworks/js/napi/accesstoken/libabilityaccessctrl.map new file mode 100644 index 000000000..ff09ec0f9 --- /dev/null +++ b/frameworks/js/napi/accesstoken/libabilityaccessctrl.map @@ -0,0 +1,20 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + }; + local: + *; +}; \ No newline at end of file diff --git a/frameworks/js/napi/el5filekeymanager/BUILD.gn b/frameworks/js/napi/el5filekeymanager/BUILD.gn index 7a42453e5..0c5a29467 100644 --- a/frameworks/js/napi/el5filekeymanager/BUILD.gn +++ b/frameworks/js/napi/el5filekeymanager/BUILD.gn @@ -22,6 +22,11 @@ ohos_shared_library("screenlockfilemanager") { } branch_protector_ret = "pac_ret" + if (!use_clang_coverage) { + version_script = "screenlockfilemanager.map" + shlib_type = "sa" + } + include_dirs = [ "${access_token_path}/frameworks/inner_api/el5filekeymanager/include", "${access_token_path}/interfaces/inner_api/el5filekeymanager/include", diff --git a/frameworks/js/napi/el5filekeymanager/screenlockfilemanager.map b/frameworks/js/napi/el5filekeymanager/screenlockfilemanager.map new file mode 100644 index 000000000..ff09ec0f9 --- /dev/null +++ b/frameworks/js/napi/el5filekeymanager/screenlockfilemanager.map @@ -0,0 +1,20 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + }; + local: + *; +}; \ No newline at end of file diff --git a/frameworks/js/napi/privacy/BUILD.gn b/frameworks/js/napi/privacy/BUILD.gn index 4621e4760..885f7364a 100644 --- a/frameworks/js/napi/privacy/BUILD.gn +++ b/frameworks/js/napi/privacy/BUILD.gn @@ -20,6 +20,11 @@ ohos_shared_library("libprivacymanager") { cfi_cross_dso = true debug = false } + if (!use_clang_coverage) { + version_script = "accesstoken_manager_service.map" + } + shlib_type = "sa" + branch_protector_ret = "pac_ret" include_dirs = [ "${access_token_path}/frameworks/common/include", diff --git a/frameworks/js/napi/privacy/libprivacymanager.map b/frameworks/js/napi/privacy/libprivacymanager.map new file mode 100644 index 000000000..ff09ec0f9 --- /dev/null +++ b/frameworks/js/napi/privacy/libprivacymanager.map @@ -0,0 +1,20 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + }; + local: + *; +}; \ No newline at end of file diff --git a/frameworks/privacy/BUILD.gn b/frameworks/privacy/BUILD.gn index b452f0cda..1b65ac456 100644 --- a/frameworks/privacy/BUILD.gn +++ b/frameworks/privacy/BUILD.gn @@ -23,6 +23,11 @@ ohos_shared_library("privacy_communication_adapter_cxx") { cfi_cross_dso = true debug = false } + + if(!use_clang_coverage) { + version_script = "privacy_communication_adapter_cxx.map" + } + branch_protector_ret = "pac_ret" include_dirs = [ diff --git a/frameworks/privacy/privacy_communication_adapter_cxx.map b/frameworks/privacy/privacy_communication_adapter_cxx.map new file mode 100644 index 000000000..b08ade653 --- /dev/null +++ b/frameworks/privacy/privacy_communication_adapter_cxx.map @@ -0,0 +1,38 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + "VTT for OHOS::Security::AccessToken::AddPermParamInfoParcel"; + "vtable for OHOS::Security::AccessToken::AddPermParamInfoParcel"; + "VTT for OHOS::Security::AccessToken::PermissionUsedTypeInfoParcel"; + "vtable for OHOS::Security::AccessToken::PermissionUsedTypeInfoParcel"; + "VTT for OHOS::Security::AccessToken::PermissionUsedResultParcel"; + "vtable for OHOS::Security::AccessToken::PermissionUsedResultParcel"; + "VTT for OHOS::Security::AccessToken::PermissionUsedRequestParcel"; + "vtable for OHOS::Security::AccessToken::PermissionUsedRequestParcel"; + "VTT for OHOS::Security::AccessToken::SecCompEnhanceDataParcel"; + "vtable for OHOS::Security::AccessToken::SecCompEnhanceDataParcel"; + "VTT for OHOS::Security::AccessToken::ActiveChangeResponseParcel"; + "vtable for OHOS::Security::AccessToken::ActiveChangeResponseParcel"; + "OHOS::Security::AccessToken::AddPermParamInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionUsedTypeInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionUsedResultParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionUsedRequestParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::SecCompEnhanceDataParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::ActiveChangeResponseParcel::Unmarshalling(OHOS::Parcel&)"; + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/inner_api/el5filekeymanager/BUILD.gn b/interfaces/inner_api/el5filekeymanager/BUILD.gn index d4c36ca0d..e1c6ce866 100644 --- a/interfaces/inner_api/el5filekeymanager/BUILD.gn +++ b/interfaces/inner_api/el5filekeymanager/BUILD.gn @@ -28,6 +28,11 @@ ohos_shared_library("el5_filekey_manager_sdk") { cfi_cross_dso = true debug = false } + + if(!use_clang_coverage) { + version_script = "el5_filekey_manager_sdk.map" + } + branch_protector_ret = "pac_ret" cflags_cc = [ diff --git a/interfaces/inner_api/el5filekeymanager/el5_filekey_manager_sdk.map b/interfaces/inner_api/el5filekeymanager/el5_filekey_manager_sdk.map new file mode 100644 index 000000000..696152526 --- /dev/null +++ b/interfaces/inner_api/el5filekeymanager/el5_filekey_manager_sdk.map @@ -0,0 +1,26 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + "OHOS::Security::AccessToken::El5FilekeyManagerKit::AcquireAccess(OHOS::Security::AccessToken::DataLockType)"; + "OHOS::Security::AccessToken::El5FilekeyManagerKit::ReleaseAccess(OHOS::Security::AccessToken::DataLockType)"; + "OHOS::Security::AccessToken::El5FilekeyManagerKit::QueryAppKeyState(OHOS::Security::AccessToken::DataLockType)"; + "VTT for OHOS::Security::AccessToken::AppKeyInfo"; + "vtable for OHOS::Security::AccessToken::AppKeyInfo"; + ""; + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/innerkits/accesstoken/BUILD.gn b/interfaces/innerkits/accesstoken/BUILD.gn index 72f24f1d6..a9cb5e550 100644 --- a/interfaces/innerkits/accesstoken/BUILD.gn +++ b/interfaces/innerkits/accesstoken/BUILD.gn @@ -102,6 +102,11 @@ if (is_standard_system) { cfi_cross_dso = true debug = false } + + if (!use_clang_coverage) { + version_script = "libtokenid_sdk.map" + } + branch_protector_ret = "pac_ret" innerapi_tags = [ "platformsdk", diff --git a/interfaces/innerkits/accesstoken/libtokenid_sdk.map b/interfaces/innerkits/accesstoken/libtokenid_sdk.map new file mode 100644 index 000000000..de5f99573 --- /dev/null +++ b/interfaces/innerkits/accesstoken/libtokenid_sdk.map @@ -0,0 +1,22 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + "OHOS::Security::AccessToken::TokenIdKit::IsSystemAppByFullTokenID(unsigned long)"; + ""; + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/innerkits/analysis_model/BUILD.gn b/interfaces/innerkits/analysis_model/BUILD.gn index dd19cabba..983775974 100644 --- a/interfaces/innerkits/analysis_model/BUILD.gn +++ b/interfaces/innerkits/analysis_model/BUILD.gn @@ -28,6 +28,12 @@ if (is_standard_system) { cfi_cross_dso = true debug = false } + + if(!use_clang_coverage) { + version_script = "libcodesignature_analysis.map" + } + shlib_type = "sa" + branch_protector_ret = "pac_ret" public_configs = [ ":accesstoken" ] diff --git a/interfaces/innerkits/analysis_model/libcodesignature_analysis.map b/interfaces/innerkits/analysis_model/libcodesignature_analysis.map new file mode 100644 index 000000000..ff09ec0f9 --- /dev/null +++ b/interfaces/innerkits/analysis_model/libcodesignature_analysis.map @@ -0,0 +1,20 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/innerkits/nativetoken/BUILD.gn b/interfaces/innerkits/nativetoken/BUILD.gn index 1caeae894..e194328f5 100644 --- a/interfaces/innerkits/nativetoken/BUILD.gn +++ b/interfaces/innerkits/nativetoken/BUILD.gn @@ -63,6 +63,9 @@ if (is_standard_system) { cfi_cross_dso = true debug = false } + + shlib_type = "sa" + branch_protector_ret = "pac_ret" innerapi_tags = [ "platformsdk" ] public_configs = [ ":accesstokenlib" ] diff --git a/interfaces/innerkits/token_setproc/BUILD.gn b/interfaces/innerkits/token_setproc/BUILD.gn index 0b0d7d83a..4d7f335b7 100644 --- a/interfaces/innerkits/token_setproc/BUILD.gn +++ b/interfaces/innerkits/token_setproc/BUILD.gn @@ -43,6 +43,11 @@ if (is_standard_system) { cfi_cross_dso = true debug = false } + + if(!use_clang_coverage) { + version_script = "libtokensetproc_shared.map" + } + branch_protector_ret = "pac_ret" innerapi_tags = [ "platformsdk" ] public_configs = [ ":setproc_config" ] diff --git a/interfaces/innerkits/token_setproc/libtokensetproc_shared.map b/interfaces/innerkits/token_setproc/libtokensetproc_shared.map new file mode 100644 index 000000000..8e2516210 --- /dev/null +++ b/interfaces/innerkits/token_setproc/libtokensetproc_shared.map @@ -0,0 +1,21 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +1.0 { + global: + extern "C++" { + "GetSelfTokenID"; + }; + local: + *; +}; \ No newline at end of file diff --git a/interfaces/innerkits/tokensync/BUILD.gn b/interfaces/innerkits/tokensync/BUILD.gn index 4053b2bf1..f0ebe8c94 100644 --- a/interfaces/innerkits/tokensync/BUILD.gn +++ b/interfaces/innerkits/tokensync/BUILD.gn @@ -28,6 +28,9 @@ if (is_standard_system) { cfi_cross_dso = true debug = false } + + shlib_type = "sa" + branch_protector_ret = "pac_ret" output_name = "libtokensync_sdk" diff --git a/interfaces/kits/capi/accesstoken/BUILD.gn b/interfaces/kits/capi/accesstoken/BUILD.gn index 11093e09e..481c0c4fc 100644 --- a/interfaces/kits/capi/accesstoken/BUILD.gn +++ b/interfaces/kits/capi/accesstoken/BUILD.gn @@ -34,6 +34,8 @@ ohos_shared_library("libability_access_control") { sources = [ "src/ability_access_control.cpp" ] + shlib_type = "sa" + deps = [ "${access_token_path}/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "${access_token_path}/interfaces/innerkits/token_setproc:libtokensetproc_shared", diff --git a/interfaces/kits/cj/accesstoken/BUILD.gn b/interfaces/kits/cj/accesstoken/BUILD.gn index b2af68dca..bc9e64660 100644 --- a/interfaces/kits/cj/accesstoken/BUILD.gn +++ b/interfaces/kits/cj/accesstoken/BUILD.gn @@ -24,6 +24,9 @@ ohos_shared_library("cj_ability_access_ctrl_ffi") { cfi_cross_dso = true debug = false } + + shlib_type = "sa" + branch_protector_ret = "pac_ret" include_dirs = [ "${access_token_path}/frameworks/common/include", diff --git a/interfaces/kits/cj/screenlockfilemanager/BUILD.gn b/interfaces/kits/cj/screenlockfilemanager/BUILD.gn index ff1dd353d..d4d4009a9 100644 --- a/interfaces/kits/cj/screenlockfilemanager/BUILD.gn +++ b/interfaces/kits/cj/screenlockfilemanager/BUILD.gn @@ -24,6 +24,9 @@ ohos_shared_library("cj_screen_lock_file_manager_ffi") { cfi_cross_dso = true debug = false } + + shlib_type = "sa" + branch_protector_ret = "pac_ret" include_dirs = [ "${access_token_path}/frameworks/inner_api/el5filekeymanager/include", diff --git a/services/common/ability_manager/BUILD.gn b/services/common/ability_manager/BUILD.gn index ba8f9d65f..23c3bed94 100644 --- a/services/common/ability_manager/BUILD.gn +++ b/services/common/ability_manager/BUILD.gn @@ -29,6 +29,9 @@ ohos_shared_library("accesstoken_ability_manager_adapter") { cfi_cross_dso = true debug = false } + + shlib_type = "sa" + branch_protector_ret = "pac_ret" include_dirs = [ diff --git a/services/common/app_manager/BUILD.gn b/services/common/app_manager/BUILD.gn index a6026e7f2..2b819f6f6 100644 --- a/services/common/app_manager/BUILD.gn +++ b/services/common/app_manager/BUILD.gn @@ -22,6 +22,9 @@ ohos_shared_library("accesstoken_app_manager") { cfi_cross_dso = true debug = false } + + shlib_type = "sa" + branch_protector_ret = "pac_ret" include_dirs = [ diff --git a/services/common/screenlock_manager/BUILD.gn b/services/common/screenlock_manager/BUILD.gn index 8a03c4ba4..c51e92a88 100644 --- a/services/common/screenlock_manager/BUILD.gn +++ b/services/common/screenlock_manager/BUILD.gn @@ -28,6 +28,9 @@ ohos_shared_library("accesstoken_screenlock_manager") { cfi_cross_dso = true debug = false } + + shlib_type = "sa" + branch_protector_ret = "pac_ret" include_dirs = [ "include" ] -- Gitee From a0531c3861faa6b741346f00f22bf3201fb4d885 Mon Sep 17 00:00:00 2001 From: luowei Date: Mon, 3 Mar 2025 11:42:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?sa=E7=AC=A6=E5=8F=B7=E4=BC=98=E5=8C=96=5Flu?= =?UTF-8?q?owei?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: luowei --- .../accesstoken/accesstoken_communication_adapter_cxx.map | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/accesstoken/accesstoken_communication_adapter_cxx.map b/frameworks/accesstoken/accesstoken_communication_adapter_cxx.map index 66b1c315a..22428ac84 100644 --- a/frameworks/accesstoken/accesstoken_communication_adapter_cxx.map +++ b/frameworks/accesstoken/accesstoken_communication_adapter_cxx.map @@ -14,7 +14,7 @@ 1.0 { global: extern "C++" { - "VVT for OHOS::Security::AccessToken::HapTokenInfoForSyncParcel"; + "VTT for OHOS::Security::AccessToken::HapTokenInfoForSyncParcel"; "vtable for OHOS::Security::AccessToken::HapTokenInfoForSyncParcel"; "VTT for OHOS::Security::AccessToken::PermissionDefParcel"; "vtable for OHOS::Security::AccessToken::PermissionDefParcel"; @@ -23,7 +23,7 @@ "VTT for OHOS::Security::AccessToken::PermissionGrantInfoParcel"; "vtable for OHOS::Security::AccessToken::PermissionGrantInfoParcel"; "VTT for OHOS::Security::AccessToken::PermStateChangeScopeParcel"; - "vtable for OHOS::Security::AccessToken::PermStateChangeScopeParcel"； + "vtable for OHOS::Security::AccessToken::PermStateChangeScopeParcel"; "VTT for OHOS::Security::AccessToken::HapInfoParcel"; "vtable for OHOS::Security::AccessToken::HapInfoParcel"; "VTT for OHOS::Security::AccessToken::HapPolicyParcel"; @@ -44,7 +44,7 @@ "OHOS::Security::AccessToken::PermissionDefParcel"; "OHOS::Security::AccessToken::PermissionStateChangeInfoParcel::Unmarshalling(OHOS::Parcel&)"; "OHOS::Security::AccessToken::HapTokenInfoForSyncParcel::Unmarshalling(OHOS::Parcel&)"; - "OHOS::Security::AccessToken::PermissionStateChangeInfoParcel::Unmarshalling(OHOS::Parcel&)"; + "OHOS::Security::AccessToken::PermissionGrantInfoParcel::Unmarshalling(OHOS::Parcel&)"; "OHOS::Security::AccessToken::HapTokenInfoParcel::Unmarshalling(OHOS::Parcel&)"; "OHOS::Security::AccessToken::NativeTokenInfoParcel::Unmarshalling(OHOS::Parcel&)"; "OHOS::Security::AccessToken::PermissionListStateParcel::Unmarshalling(OHOS::Parcel&)"; -- Gitee