From e5eeba1c0d11d638f6232f68166cc5d8ef42c65e Mon Sep 17 00:00:00 2001 From: handyohos Date: Wed, 2 Feb 2022 12:46:55 +0800 Subject: [PATCH] bugfix: qemu-arm-linux platform support access_token. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1)内核开启access token特性宏 2)access_token模块增加napi的隔离处理 3)qemu-arm-linux-min产品中增加access_token部件的编译 Signed-off-by: handyohos Change-Id: I0eb566dcee36bb6316692431ecbbff65c24f3bd8 #I4SL46 --- BUILD.gn | 2 +- interfaces/kits/BUILD.gn | 21 +++++++++++++++++++++ interfaces/kits/accesstoken/BUILD.gn | 4 ---- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 interfaces/kits/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn index f88c0ba9d..d57c193e9 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -19,7 +19,7 @@ group("accesstoken_build_module") { "//base/security/access_token/interfaces/innerkits/accesstoken:libaccesstoken_sdk", "//base/security/access_token/interfaces/innerkits/nativetoken:libnativetoken", "//base/security/access_token/interfaces/innerkits/token_setproc:libtoken_setproc", - "//base/security/access_token/interfaces/kits/accesstoken:libabilityaccessctrl", + "//base/security/access_token/interfaces/kits:napi_packages", "//base/security/access_token/services/accesstokenmanager:accesstoken_manager_service", "//base/security/access_token/services/accesstokenmanager/main/sa_profile:accesstoken_sa_profile_standard", ] diff --git a/interfaces/kits/BUILD.gn b/interfaces/kits/BUILD.gn new file mode 100644 index 000000000..cf2e891f4 --- /dev/null +++ b/interfaces/kits/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright (c) 2021 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. + +import("//build/ohos.gni") + +group("napi_packages") { + deps = [] + if (support_jsapi) { + deps += [ "//base/security/access_token/interfaces/kits/accesstoken:libabilityaccessctrl" ] + } +} diff --git a/interfaces/kits/accesstoken/BUILD.gn b/interfaces/kits/accesstoken/BUILD.gn index fe8d9002e..1c864538f 100644 --- a/interfaces/kits/accesstoken/BUILD.gn +++ b/interfaces/kits/accesstoken/BUILD.gn @@ -13,10 +13,6 @@ import("//build/ohos.gni") -group("napi_packages") { - deps = [ "//base/security/access_token/interfaces/kits/accesstoken:libabilityaccessctrl" ] -} - ohos_shared_library("libabilityaccessctrl") { include_dirs = [ "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include", -- Gitee