From e45bcc9d4f230dd95ceb989aa060639d4dabce8d Mon Sep 17 00:00:00 2001 From: arvinzzz Date: Thu, 25 Nov 2021 18:02:23 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=BA=93=E7=9A=84=E7=BC=96=E8=AF=91=E8=A1=8C?= =?UTF-8?q?=E4=B8=BA=E7=94=B1=E4=B8=89=E6=96=B9=E7=A7=BB=E8=87=B3=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E8=BF=9B=E8=A1=8C=E6=8E=A7=E5=88=B6=20close:=20#I4JUK?= =?UTF-8?q?M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: arvinzzz Change-Id: I201507aae937a01f49eafcf5909c07eae4a60123 --- BUILD.gn | 3 --- kal/BUILD.gn | 2 ++ kal/libsec/BUILD.gn | 43 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 kal/libsec/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn index ffa056b4..fa0ac5dd 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -245,8 +245,6 @@ config("public") { } } - configs += - [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_public_config" ] configs += [ "$LITEOSTHIRDPARTY/musl/porting/liteos_m/kernel:include" ] } @@ -270,7 +268,6 @@ group("modules") { } } - deps += [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_static" ] deps += [ "$LITEOSTHIRDPARTY/musl/porting/liteos_m/kernel" ] } diff --git a/kal/BUILD.gn b/kal/BUILD.gn index 0850528a..a4153d40 100644 --- a/kal/BUILD.gn +++ b/kal/BUILD.gn @@ -32,11 +32,13 @@ import("//kernel/liteos_m/liteos.gni") group("kal") { deps = [ "cmsis" ] deps += [ "posix" ] + deps += [ "libsec" ] } config("public") { configs = [ "cmsis:public", "posix:public", + "libsec:public", ] } diff --git a/kal/libsec/BUILD.gn b/kal/libsec/BUILD.gn new file mode 100644 index 00000000..36179b6a --- /dev/null +++ b/kal/libsec/BUILD.gn @@ -0,0 +1,43 @@ +# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. +# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this list of +# conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, this list +# of conditions and the following disclaimer in the documentation and/or other materials +# provided with the distribution. +# +# 3. Neither the name of the copyright holder nor the names of its contributors may be used +# to endorse or promote products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, +# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +import("//kernel/liteos_m/liteos.gni") +import("//third_party/bounds_checking_function/libsec_src.gni") + +module_name = get_path_info(rebase_path("."), "name") +kernel_module(module_name) { + sources = libsec_sources + + public_configs = [ ":public" ] +} + +config("public") { + include_dirs = libsec_include_dirs + defines = [ "SECUREC_IN_KERNEL=0" ] +}