From 3311d73406b68d289b6f715a099e90f62c86abd1 Mon Sep 17 00:00:00 2001 From: kenneth Date: Sat, 9 Oct 2021 09:07:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20c-sky=E7=AD=89=E8=8A=AF=E7=89=87?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E7=9A=84BUILD.gn=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增加的c-sky等模块的BUILD.gn实现和其他芯片架构不一致，已优化为一致 close #I4D129 Signed-off-by: kenneth --- kernel/arch/csky/v2/gcc/BUILD.gn | 10 +++------- kernel/arch/xtensa/lx6/gcc/BUILD.gn | 10 +++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/kernel/arch/csky/v2/gcc/BUILD.gn b/kernel/arch/csky/v2/gcc/BUILD.gn index 97e5000c..9adb6f49 100644 --- a/kernel/arch/csky/v2/gcc/BUILD.gn +++ b/kernel/arch/csky/v2/gcc/BUILD.gn @@ -27,6 +27,8 @@ # 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/config.gni") + static_library("arch") { sources = [ "los_context.c", @@ -36,11 +38,5 @@ static_library("arch") { "los_timer.c", ] - include_dirs = [ - ".", - "../../../../../kernel/arch/include", - "../../../../../kernel/include", - "../../../../../utils", - "//third_party/bounds_checking_function/include", - ] + configs += [ "$LITEOSTOPDIR:los_config" ] } diff --git a/kernel/arch/xtensa/lx6/gcc/BUILD.gn b/kernel/arch/xtensa/lx6/gcc/BUILD.gn index a2bfb9b5..04cc4640 100644 --- a/kernel/arch/xtensa/lx6/gcc/BUILD.gn +++ b/kernel/arch/xtensa/lx6/gcc/BUILD.gn @@ -27,6 +27,8 @@ # 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/config.gni") + static_library("arch") { sources = [ "los_context.c", @@ -37,11 +39,5 @@ static_library("arch") { "los_window.S", ] - include_dirs = [ - ".", - "../../../../../kernel/arch/include", - "../../../../../kernel/include", - "../../../../../utils", - "//third_party/bounds_checking_function/include", - ] + configs += [ "$LITEOSTOPDIR:los_config" ] }