From 29ad89c2a03b0fdadf587e8bc05c694b8d6fa141 Mon Sep 17 00:00:00 2001 From: yudechen Date: Mon, 9 Jan 2023 20:26:22 +0800 Subject: [PATCH 1/2] build: slim down the libsyscap_interface_shared.so. Signed-off-by: yudechen Change-Id: I41f3c041ceabec9d861c32182f534b5258292a2e --- BUILD.gn | 10 ++++++++++ libsyscap_interface_shared.versionscript | 24 ++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 libsyscap_interface_shared.versionscript diff --git a/BUILD.gn b/BUILD.gn index b01dff9..d90f564 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -87,6 +87,15 @@ if (defined(ohos_lite)) { } } else { shared_library("syscap_interface_shared") { + _version_script = rebase_path("libsyscap_interface_shared.versionscript") + if (!defined(ldflags)) { + ldflags = [] + } + ldflags += [ + "-rdynamic", + "-Wl,--version-script=${_version_script}", + ] + include_dirs = [ "include", "src", @@ -106,6 +115,7 @@ if (defined(ohos_lite)) { } } else { ohos_shared_library("syscap_interface_shared") { + version_script = "libsyscap_interface_shared.versionscript" include_dirs = [ "include", "src", diff --git a/libsyscap_interface_shared.versionscript b/libsyscap_interface_shared.versionscript new file mode 100644 index 0000000..a1fdbba --- /dev/null +++ b/libsyscap_interface_shared.versionscript @@ -0,0 +1,24 @@ +# 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. + +{ + global: + ComparePcidString; + DecodeOsSyscap; + DecodePrivateSyscap; + EncodeOsSyscap; + EncodePrivateSyscap; + DecodeRpcidToStringFormat; + FreeCompareError; + local: *; +}; From ae01b07bd3c0456b2e2511b69c01b38868d7075c Mon Sep 17 00:00:00 2001 From: l00524378 Date: Tue, 10 Jan 2023 17:28:37 +0800 Subject: [PATCH 2/2] Description: add syscap of cloud oaid Sig: SIG_ApplicaitonFramework Feature or Bugfix: Feature Binary Source: No Signed-off-by: li-tianfu1 --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index d1b18e6..97e0a0b 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -265,6 +265,7 @@ typedef enum SystemCapabilityNum { COMMUNICATION_NFC_TAG, COMMUNICATION_NFC_CARDEMULATION, SECURITY_CERT, + CLOUD_OAID, // Add before here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -510,6 +511,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Communication.NFC.Tag", COMMUNICATION_NFC_TAG}, {"SystemCapability.Communication.NFC.CardEmulation", COMMUNICATION_NFC_CARDEMULATION}, {"SystemCapability.Security.Cert", SECURITY_CERT}, + {"SystemCapability.Cloud.OAID", CLOUD_OAID}, }; #ifdef __cplusplus